Merge branch 'maint-1.4.0'
commit211e3ccb8606247f1067c0913d8d2e98ee992ec8
authorDavid Aguilar <davvid@gmail.com>
Sat, 14 Nov 2009 12:05:51 +0000 (14 04:05 -0800)
committerDavid Aguilar <davvid@gmail.com>
Sat, 14 Nov 2009 12:05:51 +0000 (14 04:05 -0800)
tree5fceda9ad377ad79ff742a228f894dae62c68683
parent8eb1ce6f739e728a241fc4a4fcdcd381cb350b1a
parenta4abb434f60f023ff39a4d47bca0d14f9708b91c
Merge branch 'maint-1.4.0'

* maint-1.4.0:
  doc: Add git-cola-1.4.0.4 release notes
  Move SSH_ASKPASS scripts to share/git-cola/bin
Makefile
setup.py