Merge branch 'MDL-46878-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 04:05:32 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 04:05:32 +0000 (12:05 +0800)
commit28eca8cf5b5d362e504db94ddd003fc0c4805f0b
tree92ff7277f0b916eb6af0888e3924a25537139120
parentb7fd9a0d25db21ae65a681802a5ed5e2b95e5a46
parentd569c0dae26fcf5bdd65cbf169e51e80867d4bd4
Merge branch 'MDL-46878-master' of git://github.com/FMCorz/moodle