Merge branch 'MDL-38424_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 22:17:39 +0000 (23:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 22:17:39 +0000 (23:17 +0100)
commitec05fb8367144fe015caa5fd3c3ecc441dbd8086
tree6b137feb6b3109fafdc3a6b8767653be25a8ecb8
parent85620106df50345f303ef2ab82e6493b154cd56c
parentf6adb060f8e661507fcce18f28f7a30504fd2c04
Merge branch 'MDL-38424_master' of git://github.com/kordan/moodle