Merge branch 'newtext' of git://github.com/sunny256/gitmagic