Merge branch 'wip-MDL-49880-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:12:44 +0000 (12:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:12:44 +0000 (12:12 +0800)
commit1577072b7bd0708773d94ebd594353cfdcd47347
tree4b7a8e956222a877cda3b5374f55e956c875287d
parentb9476466f12a2992f26adbfc9513face6f9ee6f2
parent08000e535d10e0e3532d348043ee2495284f436a
Merge branch 'wip-MDL-49880-master' of git://github.com/abgreeve/moodle