Fri, 22 Aug 2008 08:26:18 +0200 Christian Ebert Avoid additional conflicts during merge/resolve
Thu, 21 Aug 2008 21:32:06 +0200 Christian Ebert (stable) merge with default stable
(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 tip