Merge branch 'MDL-53057-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 07:19:01 +0000 (15:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 07:19:01 +0000 (15:19 +0800)
commit8ea783f31500d51330f876ceeb87c6dc16eb7124
tree031872a4032461a531c0cab9e0a07635cfe34536
parent016208776f2682ddd11c33fd78f54aa0ab96b3a9
parent1039b52e9af59820977ede7bfa92a1aa56f56f10
Merge branch 'MDL-53057-master' of git://github.com/FMCorz/moodle