Merge commit 'origin/tortoisemerge' into devel
commit7eaf89fd20de090e006dccfbce2ff156a63ad2c2
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 7 Apr 2009 16:50:16 +0000 (7 18:50 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 7 Apr 2009 16:50:16 +0000 (7 18:50 +0200)
tree01b0b87d77f50cc182fa155bd9a85290567733b3
parent064f4d6929437a215874fc3defd1f22467ee8596
parent57d87482147e062ac1024f293f513a2400825fcb
Merge commit 'origin/tortoisemerge' into devel