Merge branch 'master' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
extend mercurial plugin to be more like git/svn

implement in_hg(), hg_get_branch_name(), hg_prompt_info(), and hg_dirty() for the mercurial plugin
named functions similar to subversion plugin, to give theme maintainers an easier life
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Uncomment l alias
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Merge branch 'local' of git://github.com/ShadowStar/oh-my-zsh into local
Added alias for git clean