Merge branch 'MDL-56015-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Oct 2016 07:12:49 +0000 (15:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Oct 2016 07:12:49 +0000 (15:12 +0800)
commit77cfc19a850bd88e7d67fb4bfb19988ce2d118f7
tree70e9a8ebe2279f3606a6a308a47630f40b91da2b
parentce434c76645d60770f297ffc09f56a11cc6b7cf2
parent58473a67765f7d8e2cbb007217bbabf3b31f5dd1
Merge branch 'MDL-56015-master-fix1' of github.com/damyon/moodle