Merge branch 'wip-MDL-47647-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 08:18:03 +0000 (16:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 08:18:03 +0000 (16:18 +0800)
commit60c1108c308477ecc1d272bbec00127238389b7e
tree668681fa13c3e0290b484edcea997d267d50ddad
parent72dbe74e7e9096353309a5ba38490b27639d6000
parentafc3431413872ad03d3514210d39a9e0a5445a10
Merge branch 'wip-MDL-47647-master' of git://github.com/abgreeve/moodle