Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 24 Nov 2011 06:43:43 +0000
changeset 1034 0350b6b64aff
parent 1029 ab16e060541e (diff)
parent 1033 8cbcb86e4fa8 (current diff)
child 1036 1321f8629e89
Merge with stable