Sun, 05 May 2013 01:25:36 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 05 May 2013 01:25:36 +0100] rev 1225
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip