Merge branch 'svn-travis' of git://bogomips.org/git-svn