Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 03:51:09 +0000 (11:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 03:51:09 +0000 (11:51 +0800)
commitef4b8bb98b79f6fe722f9a5b5aa31f0ac4ea2426
tree0a601fef837ccddc8b53062c5f697c65ae33b62e
parent985af410a7659b977b154b7413a366a876d2c836
parentc977b350593229518b49ac80c583623af9e74946
Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle