Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 13 Sep 2012 23:02:29 +0100
changeset 1132 13a3f6161af8
parent 1130 193e68a0c8d2 (diff)
parent 1131 1938c2ebf517 (current diff)
child 1134 183d7e3d7ce8
Merge with stable