Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Jun 2016 00:46:17 +0000 (08:46 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:14 +0000 (09:04 +0100)
commit00f99e270aa980a571cc2317458f2495a9fa921c
tree63c06d4345e4d3fea2777acf3e93ce40d0c3586a
parent5869e4b74fa7d4d07b879c49453b1861bfda12cc
parentf549e4b7e8c7290020f59cbcbf4b4dd45d8cbdfc
Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle