Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 00:01:16 +0000 (08:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 00:01:16 +0000 (08:01 +0800)
commit37f45f44b72295692090eabc48600258328f0a49
tree5537fc6192b2e95453bf55fbcf1198344e68056a
parent675c6d4b54db622fb03142f757b0d5e09f96db76
parent176bcaa928dde1c8bb00fa078ab4446dddf4de1a
Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle