Tue, 04 Mar 2014 17:24:44 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Mar 2014 17:24:44 +0000] rev 1352
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 tip