Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 05:46:18 +0000 (13:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 05:46:18 +0000 (13:46 +0800)
commitcd55c6e249f9490d4ea0a75b98026d12811ec47b
tree0c6a620c281be8c1c32dfc7ac9ea2b67f47de27a
parentb831527ce88d4ed4a89db3eed987ee78170a594a
parenta2497e503666b86b31a517be58af1f69a5dee161
Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle