Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 23 Jan 2012 16:21:12 +0100
changeset 1047 cac01b4e4a6c
parent 1042 91e083fab1a3 (diff)
parent 1046 2890e1f3d8e4 (current diff)
child 1050 a0451f80f665
Merge with stable