stable: merge with default stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 26 Jan 2011 17:49:11 +0000
branchstable
changeset 876 20db7f6aba9a
parent 872 67aaf09289bb (diff)
parent 875 e01f1b4a62e9 (current diff)
child 877 c2ca6e172fd8
stable: merge with default