Tue, 24 Sep 2013 03:12:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Sep 2013 03:12:59 +0100] rev 1294
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 tip