Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:36:29 +0000 (16:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:36:29 +0000 (16:36 +0800)
commitab429bfa09b65df8cc96fbd63f001e0e67419155
treefbfbbf1ae9b9b71d2d134f17e1fe330afb7e8cb8
parentfebc3148956100d8996f2b5eceb233e9d4c8c4ed
parentd950ba1b3cc92ab564d60c72f63b5f43d3ff02d2
Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle