Merge branch 'MDL-54632-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 07:17:03 +0000 (15:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 07:17:03 +0000 (15:17 +0800)
commit9f59bc5b2c8d3f331862bc17a45cc821d5159ce0
treee475d939a81649aa2793990a30ef6af84088fa52
parent8af3e3abb266852fe0342277a81c2250d68e7911
parentbff0a28894cd8bf9d4d41ca725cf5d9e43610a35
Merge branch 'MDL-54632-master' of git://github.com/andrewnicols/moodle