Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 17 Oct 2012 17:19:48 +0200
changeset 1146 4139577a1e2a
parent 1144 3222b5b93410 (diff)
parent 1145 446f29d60749 (current diff)
child 1147 95e6504e6e27
Merge with stable