Merge branch 'MDL-51839-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 02:58:22 +0000 (10:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 02:58:22 +0000 (10:58 +0800)
commit11ce3ffccc75a8e59a21cbb34f50239441f30a7d
treeab309763ab30a3ca22e69f6857eb813937677ebe
parentbe5955edf067b81c13d3a7d67f4ac09516d4fc16
parent87d567d3c550f7444b2ac2c5393d82182c61888f
Merge branch 'MDL-51839-master' of git://github.com/andrewnicols/moodle