Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Jun 2015 02:25:36 +0000 (10:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Jun 2015 02:25:36 +0000 (10:25 +0800)
commit8cb611786727e0b870fef81eff75a0dabfaf6ce5
treee1f8a5540ea36ea0f5ae47dcdd2e3cdc9bfe3796
parent26adb614ae9c6a9a88d88dccff1b512e5ef79d71
parent0897e190937372cc6c8333eb44c3e0200d4d45d3
Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle