Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 12 Sep 2012 18:44:43 +0100
changeset 1130 193e68a0c8d2
parent 1122 feb663195388 (diff)
parent 1129 b90bb2b0826a (current diff)
child 1132 13a3f6161af8
Merge with stable