Merge branch 'MDL-49817-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 05:57:43 +0000 (13:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 05:57:43 +0000 (13:57 +0800)
commit0612d476ef00198589894f07d1beea5ec6a29815
tree3b7094b5d8733a0441ef5381baf75808944f1941
parent367cf39985beb3aa5f0e508984c5b3dd30f8ff49
parent1aa454eda43051eae45953dab0bca24b21e24f70
Merge branch 'MDL-49817-master' of git://github.com/danpoltawski/moodle