Merge branch 'MDL-51781_master' of git://github.com/markn86/moodle
commit6660fbb3d377a6d4e94682c3e8f7caeae7ab40b3
authorDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 10:08:26 +0000 (15 11:08 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 10:08:26 +0000 (15 11:08 +0100)
tree956dc0d56ba5f234d73d1f183a9e6ecf999ec4cc
parenta97cde7a6ec3fc88281764b4a2a9ebfa2937c820
parentf74fe5ba52bca86cd74c21e89567c9b2d800c14e
Merge branch 'MDL-51781_master' of git://github.com/markn86/moodle