Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:09:10 +0000 (12:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:09:10 +0000 (12:09 +0800)
commitc2a2580ac9ccbe6f7b4c215cc6f8603f25ae5e1d
tree63b7d857bc9f1598770a15d1d7b747aedbe6df0c
parent5cc2c6662d242b5f4f6249b5fc9f004b4a70dfc9
parente5d53a1c2ff8a916523002d0175c2cdbce0420a8
Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle