Merge branch 'wip-MDL-49189-master' of https://github.com/kwiliarty/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 14:02:58 +0000 (15:02 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 14:02:58 +0000 (15:02 +0100)
commit8b6ceab95321259568605adc0b92cf1de6f4cd79
tree0a916936e251c8237d1093e19adcb188186136e6
parent7c88aa7bece837d3225350c80544457c9194e01c
parentc85aa9d60672cdb8b6fc20ea94d2c67409593ffc
Merge branch 'wip-MDL-49189-master' of https://github.com/kwiliarty/moodle