Merge branch 'MDL-34248_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
commit00d4919e6980def7fbd505d6705e903c1c94ab02
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 11:01:06 +0000 (22 12:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 11:01:06 +0000 (22 12:01 +0100)
treea5a4a0b25f997f4b77dc1eb3b810d7423b12a928
parente14bbecd574788390aa477d250fb80ae55910556
parentfef6a2362673f3717f2c5c3cbb39d3ba31618aad
Merge branch 'MDL-34248_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE