Fri, 18 Nov 2011 11:06:59 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 18 Nov 2011 11:06:59 +0000] rev 1025
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip