- Result of svn merge -x --ignore-eol-style https://svn.tribler.org/libswift/trunk@27603 https://svn.tribler.org/libswift/branches/arno/swift-like-ftp@28878 
  i.e., swift-like-ftp becomes trunk.




git-svn-id: http://svn.tribler.org/libswift/trunk@28880 001aeff7-3401-0410-a489-f7902fc005dd

- Backport of encoding svn URL + revision in usage()



git-svn-id: http://svn.tribler.org/libswift/trunk@29183 001aeff7-3401-0410-a489-f7902fc005dd
Merge branch 'master' of github.com:Devristo/libswift

Conflicts:
	Makefile
	svn-revision.h