Merge branch 'master' into rc-0-8 rel-0-8-rc2
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 5 Aug 2010 13:31:11 +0000 (15:31 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 5 Aug 2010 13:31:11 +0000 (15:31 +0200)
commitee63ede02237ea3e28ae3eeef8c6896f06553fc4
tree0b8653ea3a1b8dc1db08f8e2faabd478ee80c433
parentfc7acb363d8d42a0df67eeae5784580515c58fe7
parenteee86b2be3a234dd31d79e9cdb7b6d28773690f1
Merge branch 'master' into rc-0-8