Merge branch 'MDL-51922-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 02:24:57 +0000 (10:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 02:24:57 +0000 (10:24 +0800)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge