.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
Added new function git_remote_status to check if we are ahead, behind or diverged from the remote branch
New theme 'intheloop' which demonstrates the git_remote_status function
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Make command-not-found no-op when support not available (e.g. not on Ubuntu)
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	lib/termsupport.zsh
Fixed cap plugin
Aliases

Modify directory listing aliases to make more sense. Remove conflicting helper
function (mcd conflicts with mtools).
Dollar sign instead of percent in unprivileged user prompt (as in real gentoo)
Change plugin name from cap to capistrano
use /home/ryan/d/.oh-my-zsh instead of ~/.oh-my-zsh for cache
rsync: add plugin
Updated the frisk theme to display Bazaar branch information as well (based on zedtux.zsh-theme http://j.mp/ikTZJj)