Sat, 12 Apr 2014 18:13:57 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Apr 2014 18:13:57 +0100] rev 1367
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 tip