Merge branch 'MDL-45290-master-fix' of https://github.com/jethac/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 7 May 2014 05:28:20 +0000 (13:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 7 May 2014 05:28:20 +0000 (13:28 +0800)
commit85e8f68108f1c5b161a06004496ae73da74f707c
tree2227ee3a72c4ecea3bbe53e4c6bf88c843b8dd74
parent97436e311c05dd1bef7bb875b23a9d112f9475ae
parentcecd602d8ba8f115e45996fc85d23098d53e8a04
Merge branch 'MDL-45290-master-fix' of https://github.com/jethac/moodle