Merge branch 'maint'
commit5a534788eb0da129292e6a0e557156c66b272f9f
authorShawn O. Pearce <spearce@spearce.org>
Thu, 13 Sep 2007 23:19:42 +0000 (13 19:19 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 13 Sep 2007 23:19:42 +0000 (13 19:19 -0400)
tree284f68b75ba906327a1eca0965b470d1dca74032
parent262360f3aa11291816d63fb6d23851db1ae5ff27
parente7034d66ecd9c16ae8bd8d331fc41efc48e925f1
Merge branch 'maint'

* maint:
  git-gui: Make backporting changes from i18n version easier