Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 12 May 2016 13:04:55 +0000 (14:04 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 May 2016 10:11:29 +0000 (18:11 +0800)
commit35f11c55fb27f9e9dac5aeab1833e5f3e9bf7589
tree2e34f146b7967a42a9d21a3d6e8c763985489324
parent6967b71a34a776ef290e4bde5ce66263d9f83d25
parentbae0f2375e72cd4827268fd9ff557cacd0627ec6
Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle