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