Merge branch 'master' of http://www.spearce.org/projects/scm/egit