Merge branch 'MDL-49983-master-fix-3' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2015 07:34:00 +0000 (15:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2015 07:34:00 +0000 (15:34 +0800)
commit8b3ba5b370399c5345567fa3f9e942e17651e8ab
tree9846bea252f8f5e559600c0efefdedec77676e7f
parent48645e475bf932ba1bc1b9ad30b926f610dfebbc
parent6289c2ea9403400289b6a6ff1aa6d28f29138725
Merge branch 'MDL-49983-master-fix-3' of https://github.com/xow/moodle