Merge branch 'MDL-30001_25' of git://github.com/jmvedrine/moodle into MOODLE_25_STABLE
commit666d9bea6b76dcbf4352dd786a86a1b0265bf0d7
authorDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 08:13:20 +0000 (12 16:13 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 08:13:20 +0000 (12 16:13 +0800)
tree1bc3f118e522b5985e275e9b545d59a855af5eeb
parent60238d1c2448d3b03f3154c8515e05349c13c815
parente87a512c551f1febf2a0f42600e3b15d9f2ae222
Merge branch 'MDL-30001_25' of git://github.com/jmvedrine/moodle into MOODLE_25_STABLE