Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 21 Jun 2012 14:04:15 +0100
changeset 1111 df702ad9b314
parent 1103 9459951761fb (diff)
parent 1110 d5b3404b82ce (current diff)
child 1113 1e477be3b6c8
Merge with stable