Merge branch 'wip-MDL-52475-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 03:23:41 +0000 (11:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 03:23:41 +0000 (11:23 +0800)
commit206d736006d6fc4af9ca0ac11600e6b9e5dec2e8
tree911e5aceefce15361aa9e780427dc59d3efe7158
parente04e4cddd24997fabf8e59f6d00d38e5001c2f59
parent144fb5e0a0a552eeff9a5fb59c08c0927a187655
Merge branch 'wip-MDL-52475-master' of git://github.com/marinaglancy/moodle