Mon, 24 Feb 2014 22:56:19 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 24 Feb 2014 22:56:19 +0000] rev 1344
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 tip