Merge branch 'wip-MDL-51087-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 02:18:14 +0000 (10:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 02:18:14 +0000 (10:18 +0800)
commit8d2a44b5549430a766a2d6a304b1c729f45beafc
tree9225ed4b194de68d72178cb585e4c953cd8028ca
parent6d392b302793f193616028dc92c0d98ed5015596
parentbd7a0fd38b7a6978082f4d1ddee941f337754c26
Merge branch 'wip-MDL-51087-master' of git://github.com/marinaglancy/moodle