Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)
commit6412c972e3a4ff8fdaffda5141d8d63964e32a12
tree37518c565f1baef6389aa008bd2c26ca66b1bfc3
parentc2a2580ac9ccbe6f7b4c215cc6f8603f25ae5e1d
parentc1735baff534673adf4741ef7a4e44b4d25d5fc7
Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle