Mon, 14 Apr 2014 13:21:25 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Apr 2014 13:21:25 +0100] rev 1371
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 tip