Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:35:16 +0000 (15:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:35:16 +0000 (15:35 +0800)
commitb8bc9037f11090fb82532223a72bea8350f315aa
treec1d279dbf57fda6590261e9a2e6595d86e4a09a8
parent9de085c6fc0d5dd17b36d2e207ab8259117ac883
parent1ea2f7d6509223b46f54a0692148887f04aa0247
Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle