Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 24 Oct 2011 17:02:10 +0100
changeset 997 5c25b505ffc1
parent 993 e50f10baa81a (diff)
parent 996 dadecc4f3341 (current diff)
child 1004 b675519e2a5b
Merge with stable