Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 07:03:14 +0000 (15:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 07:03:14 +0000 (15:03 +0800)
commit8af3e3abb266852fe0342277a81c2250d68e7911
treea52bc0b098222d26dae02f9affc5dbb5ecba78c1
parentca7b16fa70f7579bc5de809d5c162ef232713875
parent1e03d74cfad5f51e16b4509eaff02a84c8d86d7b
Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle