Merge branch 'MDL-51923-master-2' of git://github.com/xow/moodle
commitb5df2c1db012c5e5525874918042b968a7a44cfc
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Oct 2015 06:48:25 +0000 (29 14:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Oct 2015 06:48:25 +0000 (29 14:48 +0800)
treede4d66c0618e027a4d44a8ceb2173ce6fd10f2ce
parent37d00213693243a1f471e39b32d8ce8b83f2e6bf
parent494fec0071e8115c50fd2507d8e3f1d7b13a0723
Merge branch 'MDL-51923-master-2' of git://github.com/xow/moodle