Merge branch 'master' of ssh://git.code.sf.net/...
added preliminary support for multiple remotes
patch to 1.2.4
