Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 May 2016 01:09:11 +0000 (09:09 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 May 2016 01:09:11 +0000 (09:09 +0800)
commit58a2f0ac40f24da9c9955110902f8e14cd0d8419
tree5eeae6c0dbc3df8e49b49e65ff0aa9cde17790f1
parentfa1e76d563a13f4143262e0dcd61caafb80cd29f
parent525370afe1585d2f1f4632205efdfdd9151fc0f1
Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle