Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 05:51:14 +0000 (13:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 05:51:14 +0000 (13:51 +0800)
commit9d926d1f27d52267c687a0fa8e10b8bc6dc622f2
tree0d02a9da1a7b792f2efbd36904a7e828a077b8fc
parentec68e9d53018b3bfb6f5bb52bb52347a8de36e16
parent2d85210817566465c8864bae5d429be33f2e0ed7
Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle