Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 09 Aug 2012 12:52:34 +0100
changeset 1120 d76328c84f3e
parent 1118 9eb32646a6b8 (diff)
parent 1119 5f7f30917a18 (current diff)
child 1122 feb663195388
Merge with stable