Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 00:11:32 +0000 (13:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 00:11:32 +0000 (13:11 +1300)
commitb5e8781465f3fa8752a8c931d85e88d42c5f890f
tree6507ae465727c232d3398c7cfd2a8364278d8242
parentecf3b93d3984900743cab2e300a628d18b9561ce
parent23135041864713749e575c8e8bad92f3f043b258
Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle