Merge branch 'megle-theme' of github.com:megle/oh-my-zsh into megle-theme

Conflicts:
	themes/megle.zsh-theme
This commit is contained in:
Manuel Egle 2012-03-14 22:04:14 +01:00
commit b1084120e6

Diff content is not available