Merge branch 'svn-fe' of git://repo.or.cz/git/jrn