Merge branch 'MDL-49575-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:11:05 +0000 (15:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:11:05 +0000 (15:11 +0800)
commit4969c8ba63254f78c7628d08648e5beb4fdcbc1e
tree5f9a9b88a0bde92c529c430b221a5b52fac6aa0f
parentd7551257a01790e3bc8a423a581c5d6d97505731
parent753a29a8257d87c428149a5d33d551b278b11f86
Merge branch 'MDL-49575-master' of git://github.com/FMCorz/moodle