Merge branch 'MDL-51887-master' of git://github.com/dpalou/moodle
commit2e2e4caa7ef9d522d20ae6eca90b18cc418a964a
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Mar 2016 03:17:40 +0000 (14 11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Mar 2016 03:17:40 +0000 (14 11:17 +0800)
treebccd328b8b6a5150f6d54339c2c7ee5493ecf564
parentbac8a365fa157314847e166b094056d17ae05629
parented4fb2bf7eceebd976c3ae4fb19f937e11c8e791
Merge branch 'MDL-51887-master' of git://github.com/dpalou/moodle