Merge branch 'codesniff-backport' into 2.0
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 1 Feb 2015 18:03:13 +0000 (19:03 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 1 Feb 2015 18:03:13 +0000 (19:03 +0100)
commita46dd92ba8356769d49627e704fff3e749536dc5
tree92a7b578b7381c850f545925132a0ba23716a3dd
parentde825816d1fb52d19eca18e39a505fbd6962c489
parent6a1ecb3b55fdd360a30d7faf31a3fac4ce1000e3
Merge branch 'codesniff-backport' into 2.0

This backports the changes to the travis configuration of 'master':

0a41bff65a3b7fd71ce65b6a74ca05fd8e8d0c03
00a9e5b175ae7370fee3ce85f25ecd0916c1d4f6
e6d6eb5aebf17cede78eef5e857a631caa5f7111
29ddf8adf4e91ca5e7b6acae8f5f6888d8903caf