Merge branch 'MDL-49482-master' of https://github.com/blckct/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 09:31:48 +0000 (10:31 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 09:31:48 +0000 (10:31 +0100)
commit52f4e19bbd7931271d04d1cb3c482eab1b2147a1
tree231905bb7c88d1647315b71d9a5995fbfbd975be
parenta9ed308f743bc6e1e3745dafffe8969f75dae69d
parentec3aa5be7de6b1d2127f2e3ec99ed9ada568ea5a
Merge branch 'MDL-49482-master' of https://github.com/blckct/moodle