Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 28 May 2011 15:16:55 +0100
changeset 961 ad2d66fd14ee
parent 959 fee93dd51b18 (diff)
parent 960 d1f0b4802c19 (current diff)
child 963 b95f15ba1b1b
Merge with stable