Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)
commit2c720c9772c01ffaad6044216e0ee53c1536b45f
tree77758f7d78401eec1491675dd66b6bb1a71aac68
parentbde3e8c5d1e5730c8f576a0572b77b26648de0a4
parent8cc02383bfcdf4257a2b2bf02482eb56d3df7d13
Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle