Thu, 26 Aug 2010 17:55:07 +0200 Thomas Arendsen Hein merge with stable
Thu, 26 Aug 2010 17:38:43 +0200 Thomas Arendsen Hein Fix merge-tools.checkconflicts stable
Thu, 26 Aug 2010 17:38:43 +0200 Thomas Arendsen Hein Fix merge-tools.checkconflicts
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip