Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)
commit965595d4057a4b88294ded9409330fe85582cb78
tree6652beb615da6e7452ad92f790fb951de445712f
parentdca7e05dbfb58114ee1d945180f31d24d4c2f555
parent09ca2e85c61efea1369046e3f91dc6d46955bcee
Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle