Tue, 04 Feb 2014 00:22:20 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Feb 2014 00:22:20 +0100] rev 1324
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 tip