Merge commit 'HEAD@{1}'
commit8a687840cb0214a30d4df46590b5435c74aed528
authorPieter de Bie <pdebie@ai.rug.nl>
Tue, 23 Sep 2008 18:10:02 +0000 (23 20:10 +0200)
committerPieter de Bie <pdebie@ai.rug.nl>
Tue, 23 Sep 2008 18:30:18 +0000 (23 20:30 +0200)
tree4a6742c92353a86775149b1eb4c6d1e4c6c90cad
parent5111b363ef9c535c252aa8f4301c88892ed06ada
parente9f4830e1cbedf87da56c372d88096a06bbf7391
Merge commit 'HEAD@{1}'

* commit 'HEAD@{1}':
  Show a pretty status bar

Conflicts:
PBGitCommitView.xib
PBGitCommitView.xib