Merge branch 'MDL-49612-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 09:30:12 +0000 (09:30 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 09:30:12 +0000 (09:30 +0000)
commit6bb1bd930f70c010095a6576d84cf1c6f11855f6
tree673071ef8bb76a2c6e5f17faa281735be6c08b55
parentd330eb43427dafe90d03edb43e11372735ae9c2a
parenta69c9abdaf26fe6325b868d4dac8488a4fd4067e
Merge branch 'MDL-49612-master' of git://github.com/dpalou/moodle