Merge remote branch 'origin/dev' into dev
Conflicts: ForgeGit/forgegit/git_main.py
Authored by: Rick Copeland 2010-10-14
Parent(s): [7ee1f9][b61566]
Child(ren): [66c677]