Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 06:57:18 +0000 (14:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 06:57:18 +0000 (14:57 +0800)
commit9996e8954be3f898a3862b522450b43170599917
tree89c3244d2e14d4a720f0098b2f5993a31755841d
parentd3f1cde59e70007f998bd5664937547ad8da71b0
parentbdf899a503b3bed88f1c6500e3a5063fd33aec78
Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle