Merge branch 'mdl51440-master' of git://github.com/tlock/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 02:48:25 +0000 (10:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 02:48:25 +0000 (10:48 +0800)
commitad704e2c49c3d712ad0e81f0d81f57d80bfa7ab2
treedb79f7f93a618392adfa61b243e74f78dd3a6bae
parent8e31c017f2ff262a304937b32d51fa16cc8c897c
parent52296930dc42c5a101a5148165d350090e117156
Merge branch 'mdl51440-master' of git://github.com/tlock/moodle