Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 05:53:57 +0000 (13:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 05:53:57 +0000 (13:53 +0800)
commit3e9cf4f941b66e4e7d2c9a1c3fecf59f4339a099
tree644c4db780d2c435ba1134013fb9884793d8fe9e
parentf18561a2e252d4f7793481a40249e6da07d99aa6
parenta7be136f20ddc2f6a6a5d3df5a8ec58c7222042e
Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle