Merge branch 'MDL-47167' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 07:41:39 +0000 (15:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 07:41:39 +0000 (15:41 +0800)
commit96477b0f0d02cad2a01160a10aa99cd7e0981398
tree82213a5214099298459d466870c7e2a8fc039b20
parentdb074792b92539cf0afd3b64fa584654e4166753
parent21ed2330cfcd5acde711b2805731a140517b11c7
Merge branch 'MDL-47167' of git://github.com/timhunt/moodle