maven plugin
Merge branch 'master' of github.com:fred-o/oh-my-zsh
mvn plugin
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
.gitignore
Added a plugin for GNU Screen.
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
fix to avoid parse errors if $TERM is empty
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
Merge branch 'master' of github.com:fred-o/oh-my-zsh
figuring out home dir on unix systems as well
Merge ssh://spix-dev01/home/fredrik/.oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	lib/termsupport.zsh
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh

Conflicts:

	.gitignore
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh