Merge branch 'wip-MDL-49380-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 6 Apr 2015 02:16:38 +0000 (10:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 6 Apr 2015 02:16:38 +0000 (10:16 +0800)
commitb948d8c8a08e6e4e5cda85433ccc14dcd16410c3
tree83af55332f917156756ce603a3d492c6317b5d39
parentc3dbbe5c748c10c70e4c95a7cf312b2ca850c5f4
parent7efd0c0adbfaa0ff1826e827f71b88a8fe484bde
Merge branch 'wip-MDL-49380-master' of git://github.com/abgreeve/moodle