Thu, 13 Jun 2013 19:37:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Jun 2013 19:37:59 +0100] rev 1275
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 tip