From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Sun, 29 Jun 2014 11:59:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'vnwildman/master'
X-Git-Tag: gitgui-0.20.0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df7369f1a786295fc56f3841f67d8517001ed85f;p=thirdparty%2Fgit.git

Merge remote-tracking branch 'vnwildman/master'
---

df7369f1a786295fc56f3841f67d8517001ed85f