Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 11 Feb 2012 14:18:19 +0000
changeset 1050 a0451f80f665
parent 1047 cac01b4e4a6c (diff)
parent 1049 fcc01604f7a6 (current diff)
child 1054 671c1a0be907
Merge with stable