Merge branch 'wip-MDL-41174-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Sep 2016 05:44:36 +0000 (13:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Sep 2016 05:44:36 +0000 (13:44 +0800)
commit94c9d470d107adcefc25eaee2fc6d1a632a8beb4
treea0e2464aa351f372eeb6a38e5e6b63892d1bda5f
parent2ab5bbc409000cda756e4ff21a3dc0763a113c1c
parent9851111f7a30c587b14ce1926c2cda3d7d091966
Merge branch 'wip-MDL-41174-master' of git://github.com/abgreeve/moodle