Merge branch 'wip-MDL-48523-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 01:11:24 +0000 (09:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 01:22:48 +0000 (09:22 +0800)
commit3d10161c038f816f58dc867932759d0a210f142d
tree626a209e94920cf18e83268ab64cb394162c77b8
parenta158a856684a51d1e8fbdf4047e21aca3b70141a
parentfdc934a1653d31376da9f0924107cf8f6c391099
Merge branch 'wip-MDL-48523-master' of git://github.com/abgreeve/moodle