Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 07 Nov 2011 13:52:03 +0000
changeset 1004 b675519e2a5b
parent 997 5c25b505ffc1 (diff)
parent 1003 59bd7f017103 (current diff)
child 1006 826681fc0976
Merge with stable