Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 06:56:14 +0000 (14:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 06:56:14 +0000 (14:56 +0800)
commitf3e77a5ea520db273e42c695bc91b169f7805016
tree95e218f757b8d9fc9cbbfdd1f34b746c8dc9e685
parent6df0e788499ebefcfc724c5e52dac932dc5e2f4f
parentedd99023a66b6efe68bac6b9b765afdef194a5a5
Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle