Merge branch 'MDL-50884-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:15:47 +0000 (17:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:15:47 +0000 (17:15 +0800)
commitb3e8e09175167a5376ffbf90df456dda1f058f2e
treeb22e94e429cc191b1f942f68ed21a274c190913a
parent224d819678fea1495ad16bf3c494c132f4dee1a6
parentef6998015f9e566d4f6c5c535cb31d167ec8c68a
Merge branch 'MDL-50884-master' of git://github.com/lameze/moodle