Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 13 Oct 2011 17:48:29 +0100
changeset 988 320bd57f76a3
parent 986 0f5e2d5e716b (diff)
parent 987 5fc540826f9f (current diff)
child 990 ab082912af32
Merge with stable