Sun, 17 Nov 2013 17:30:23 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Nov 2013 17:30:23 +0000] rev 1306
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 tip