Merge branch 'MDL-54593_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 09:21:11 +0000 (10:21 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:09 +0000 (17:16 +0800)
commit76943644d43c905895c91756fc1e9bad1d75b61c
tree1ee0fe68185cd3c31b9b2377f54e4d9b4afa2459
parentbdabf42d9ad34ce93561ce4e0b7eca722dd8b2c2
parentbeb3441b68c6f214780464de837cf6c77d881f03
Merge branch 'MDL-54593_master' of git://github.com/markn86/moodle