Merge branch 'MDL-37431_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commitc01b82d4e40f6d623b4cbacf93f84bad81e5bd90
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:16:27 +0000 (15 00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:16:27 +0000 (15 00:16 +0100)
treecd11e08ff2408ab3d67264bff0a9ac254f611bb1
parentb3e8f06d20cb0f9a26ee9e5a6913cbc199c5326d
parent8c11e08765c4d524d142f4720ba5c8838261d58b
Merge branch 'MDL-37431_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE