Mon, 10 Feb 2014 14:08:42 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 10 Feb 2014 14:08:42 +0100] rev 1326
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 tip