Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:20:21 +0000 (11:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:20:21 +0000 (11:20 +0100)
commitad360e66aeacaf8f3191f92fa0ce17d68e2d77e6
treeae7a7674312cb88f8099490be54318e189642226
parente76eba8111c59cf7180236c8eca6fc5f019daa13
parentdafa20e85c62a89749b9d265196e3892c3f77fbf
Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle