Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 04 Apr 2012 09:31:47 +0200
changeset 1062 3c257fefa53d
parent 1060 2d2d93380694 (diff)
parent 1061 70b4494ccf1d (current diff)
child 1064 a33852511558
Merge with stable