Wed, 04 Jul 2012 12:04:06 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 04 Jul 2012 12:04:06 +0100] rev 1115
Merge with default
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip