Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 02:19:24 +0000 (10:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 02:19:24 +0000 (10:19 +0800)
commit0196f0101c7b0b5621fa161ecf1df368e36c6765
tree6a7130a697ac533474515ba9fb1ada190a8fa26b
parent6a74e76fb8f35b56691bf5c9d07e5e2dfcb01c10
parent43c762ef1025aab39953f33f3650652f0c5a2fe9
Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle