Merge branch 'MDL-51505-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE
commit3a435c4debbe03327456dd88866ede7adb27310b
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 02:31:04 +0000 (21 10:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 02:31:04 +0000 (21 10:31 +0800)
treed97c83a97f5b7b9051d004d1012b5b2b50a57fb4
parent364329af40cb892a8ee8daa0406798afbc5a4ca8
parent09bfb22703b9e0f3ebb04522c415e34a9f4b054a
Merge branch 'MDL-51505-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE