Merge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle
commitf6c3a2294684c92c77d4a417a3fee2bbbc0e4e63
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2015 07:38:00 +0000 (9 15:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2015 07:38:00 +0000 (9 15:38 +0800)
treed7f995e7c2e5576cb9b1b34860e9619c1524eb3a
parentab2d8946cdf459b824c291f31a7a4a1e583e9e33
parent36e0030ffe5abffa224846ba18c2c7b464826db4
Merge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle