Merge branch 'MDL-57059-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 06:15:42 +0000 (14:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 06:15:42 +0000 (14:15 +0800)
commit2a58fef860b95f944bad307553ce95ce8b59ca63
tree43794e4077d0e6aafb0ffb521016d563e8e30528
parentd062d64fb8d743377084aa5977e29ad0200fe428
parentbea19e0decf3222a64405c39d733d0f2cf358c5b
Merge branch 'MDL-57059-master' of git://github.com/lameze/moodle