Merge branch 'MDL-39758_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
commitab6a0ac4f7fca18c7f82c76fcd6267e537f49757
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 23:48:38 +0000 (21 01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 23:48:38 +0000 (21 01:48 +0200)
tree27915ee8cea92c1fbc2707f7ac8d5721f211d20e
parent18003f2adb4b649681104d4314effb8626253713
parentb6d07f25a15001233a6d7dd5dd97c57a80b731de
Merge branch 'MDL-39758_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE