Merge branch 'MDL-52899' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Feb 2016 05:44:41 +0000 (13:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Feb 2016 05:44:41 +0000 (13:44 +0800)
commit6d18da567da014dcd1193a18a1c01d00eb4f4128
tree6ee550aa1ed0adf08f03401e5db1f080954779e3
parent52ad3afadb0f6b2ec231ecbd9068bad5b48b5915
parent41f4dabe2b2fb5755688720e0dae77167424c11c
Merge branch 'MDL-52899' of git://github.com/timhunt/moodle