Merge branch 'master' of git://github.com/psionides/git-subtree