Merge branch 'MDL-54677' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:13:40 +0000 (09:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:13:40 +0000 (09:13 +0800)
commit2eb57cf7a27b6915a88971d79e27f42c4c3117f8
tree50732c9f61596580e3623e5ca6c072db0382e97c
parent7a3a3246fad3cc5377f939f7d8917acd3c55f709
parent4da854a68b7cfd526d2adee4a751b10b88e25874
Merge branch 'MDL-54677' of git://github.com/stronk7/moodle