Thu, 13 Sep 2012 23:02:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Sep 2012 23:02:29 +0100] rev 1132
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip