Merge branch 'MDL-51710-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:12:18 +0000 (09:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:12:18 +0000 (09:12 +0800)
commitca922c24e75f743ed51a1e5c2c03fa919a33084f
treea6ee227af3942610b5ec96938f2447efc4191f57
parent9ef638652b82e2fd7da54ad407d5f4b9cd37c070
parent2a5920c338263b8134ffc905b37047e836891c0d
Merge branch 'MDL-51710-master' of git://github.com/FMCorz/moodle