Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 30 Aug 2012 16:18:03 +0100
changeset 1122 feb663195388
parent 1120 d76328c84f3e (diff)
parent 1121 f4dcce73f362 (current diff)
child 1130 193e68a0c8d2
Merge with stable