Merge branch 'MDL-52158-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 02:32:34 +0000 (10:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 02:32:34 +0000 (10:32 +0800)
commit5aaa2b37505c2ff6fc4645da56b660163202e353
tree85667402cae88a9daca5a988be251b6bbb985cb2
parent55e90f22706e0f8c870037f9e9dc6e34f07a9a43
parentefdbc2929d0bf00bcdba487fc15e74104ddea5ae
Merge branch 'MDL-52158-master' of https://github.com/xow/moodle