Merge branch 'MDL-55815_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commit2087df46f6582257bfb7d7f2988dfa7b6e35686a
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 07:57:38 +0000 (5 08:57 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 07:57:38 +0000 (5 08:57 +0100)
tree7a1af0892b6d898b5c45d133603229575082dcf5
parentbc82c260b8e7fa5c9dda1412b05ca6090c9c8465
parent9ad7051878730049c78bfc87887809b708d763e4
Merge branch 'MDL-55815_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE