Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 22 Sep 2010 23:46:57 +0200
changeset 796 13bba4066f90
parent 794 12eadf33cce1 (diff)
parent 795 234c4314c6a4 (current diff)
child 803 2941e3ddd1b1
Merge with stable