Merge branch 'MDL-40990' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Mar 2015 00:22:06 +0000 (08:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Mar 2015 00:22:06 +0000 (08:22 +0800)
commit63fe1c12f784501e56020f1b6fbcd4561fe122a1
tree7b9a635e2949640b793962dfca3f093b21894761
parent94d0be78407fe2e6abf5acee7c7decda7ab837c2
parent441d284ada20943b556aaa8d73a6cc3909f04f91
Merge branch 'MDL-40990' of git://github.com/timhunt/moodle