Merge with default stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 14 Sep 2011 15:34:32 +0100
branchstable
changeset 983 06a1ec674ee8
parent 980 d487504115fe (diff)
parent 982 639bb4617c70 (current diff)
child 985 d60568a69465
Merge with default