Merge with default stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 22 Oct 2011 15:45:19 +0100
branchstable
changeset 994 89f7a7e343c9
parent 991 68475648cd7e (diff)
parent 993 e50f10baa81a (current diff)
child 995 b78cce2b1430
Merge with default