Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:01:23 +0000 (08:01 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:01:23 +0000 (08:01 +0000)
commitbd17f93f2814ecd8f249dbe4b255cd6502e58cc3
treed467ce8d6ca8778a1f45d660e4fcfc9300046887
parentd97582fd27de3afc97eba9c0d4f2f22ccc1570f4
parentfdc6656a37d3dfcc4ac002bd5d96116132ea0c93
Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle