Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 13 Apr 2016 01:51:35 +0000 (09:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 13 Apr 2016 01:51:35 +0000 (09:51 +0800)
commit101303034f1459d4dec2c7510c95c3674dca370f
tree0b815effc9136a0e896bb753b0fb90a0abc8d086
parent27bfb0ee9bcea6ff4cd6ce82a6f1e264ba56cd7e
parent1e34257ec24785b79c175f0084470327b6629c7f
Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle