Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 02 Jun 2011 00:12:10 +0100
changeset 963 b95f15ba1b1b
parent 961 ad2d66fd14ee (diff)
parent 962 b5a4f9f5ec49 (current diff)
child 965 d64b07980755
Merge with stable