Merge branch 'MDL-54177_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 07:25:52 +0000 (15:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:08 +0000 (17:16 +0800)
commit52ccda9607820481f67678e721ad20dedaae5fd0
tree96f6191126c75c461889731c1a8ecd0db066df3c
parenta7bb1dda6e42d8585376f9accfc3b2474a7feb3d
parent3f3e7daae1bd51e4b803679feaf5827fa2e9ad33
Merge branch 'MDL-54177_master' of git://github.com/markn86/moodle