Merge branch 'MDL-50115-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 06:10:39 +0000 (14:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 06:10:39 +0000 (14:10 +0800)
commit04b3c78da465092cbc7cffe0de5bb2d01b0b40ac
tree03b2b2c582a0c9c08d8640ccbefd9cd7a8676eae
parent4af9a8bfd3d6937e95d96b80b3121ec871b0f8a2
parent00cceb7fba697a867593a488dce23a31eb575a4c
Merge branch 'MDL-50115-master' of git://github.com/danpoltawski/moodle