Merge commit 'v1.6.3.2' into develv1.6.3.2.msysgit.0
commitee46c5fa097b754bc050c300360136236924b223
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 7 Jun 2009 09:54:07 +0000 (7 11:54 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 7 Jun 2009 09:54:07 +0000 (7 11:54 +0200)
tree1fa82849413b29c50fe81009648f7ced6300d0f3
parenta464b3e17abc16b3ece8fa8c4b4e98a499873b45
parent6c7f58d6f691c1091b90b0891e94c91e20fd6054
Merge commit 'v1.6.3.2' into devel

Conflicts:
Makefile
decorate.c
object.c

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Makefile
t/t6200-fmt-merge-msg.sh