Thu, 28 Nov 2013 12:59:05 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Nov 2013 12:59:05 +0000] rev 1312
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 tip