Merge branch 'MDL-52334' of git://github.com/aolley/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 00:45:30 +0000 (08:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 00:45:30 +0000 (08:45 +0800)
commit8dccd20f769280aa3d85696eed4ca00c1b0e7176
treeecf410a5d1c1c2a308b9758a1b10aeae2e334da2
parentbf47ce505032c08fd0dc7a05466df4f9bc2cccb4
parent6c9b6685de07f9fc4531428232b322e962007727
Merge branch 'MDL-52334' of git://github.com/aolley/moodle