Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 06:49:49 +0000 (14:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 06:49:49 +0000 (14:49 +0800)
commit3fa81fabc3032e5f79e9c5613ccadd0cca71feec
treea970251590ce7effc5d14ba5825403c7d8855a85
parentbd71cb83dff40834224659195728e8de60a5d936
parent6deb0344c57e0661c09c08892b9eabe2ccb199bd
Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle