Merge branch 'MDL-53095-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:49:50 +0000 (11:49 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:49:50 +0000 (11:49 +0100)
commitd6c8570f5548e932d04e88dbe5e06c92760c0efa
treec856b4baa6e0d450e6794f7e8e53f1a4a02e2ca1
parent913dcb1b81805981b743c5065466af95fedd4404
parent4584c3de23b522ab4eb9f794e5063fa094394529
Merge branch 'MDL-53095-master' of git://github.com/lameze/moodle