Merge branch 'MDL-49383-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 11:05:45 +0000 (12:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 11:05:45 +0000 (12:05 +0100)
commit6d0e700eda2bb661253fd5601ab81283d8b6e114
tree5f2aa3263c3aedf84d3f8e44703710f7d9ff3f9d
parentd2a0482d175703fedcfb01db656be7900451719e
parentf4864c1cd275a9dc01660a58ce4bbc0279d2107f
Merge branch 'MDL-49383-master' of git://github.com/lameze/moodle