Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 08:01:46 +0000 (09:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 08:01:46 +0000 (09:01 +0100)
commit9d6e3cb6c0daefde6cd2c2a8b6666858aa6515a1
treeedce37b705f54849923af86bc64dda8e0933f3c5
parent8cdc6f3224690d610d432de70be1ec9c8430d688
parentc71d18565831de6d990d55e916d120adf5a6c03b
Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle