Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 04 Jul 2012 12:06:34 +0100
changeset 1118 9eb32646a6b8
parent 1114 22b300b7a7c1 (diff)
parent 1117 8d5052f23e99 (current diff)
child 1120 d76328c84f3e
Merge with stable