Merge branch 'bw/searching'
authorPat Thoyts <patthoyts@users.sourceforge.net>
Wed, 19 Oct 2011 12:35:30 +0000 (13:35 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Wed, 19 Oct 2011 12:35:30 +0000 (13:35 +0100)
1  2 
git-gui.sh
diff --cc git-gui.sh
Simple merge