Merge branch 'MDL-30603_m23' of https://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 18:49:19 +0000 (19:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 18:49:19 +0000 (19:49 +0100)
commit6920a616694b6f41bdf16dd1a45f35aeffa2c7ef
tree92c498972576de99984253912b8f8248f16238bb
parente2ec1ebdf6efa04cb1779925783783f6e154a555
parent9f26a481ae7cc49667f9bf93b81f5696d365402b
Merge branch 'MDL-30603_m23' of https://github.com/nebgor/moodle