Merge branch 'master' into rc-1-0
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 22 Sep 2011 13:10:36 +0000 (15:10 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 22 Sep 2011 13:10:36 +0000 (15:10 +0200)
commit0d9e7cf4c7cd047460b48b7dd5940662eee4fc3c
tree8b1e12d43c05544278f38a07a58792c0b212cabd
parent4b46c6578e6c5605d2745649864233e9049e631d
parentb1a617260291d54d73cbeef18cc1ff8d12969795
Merge branch 'master' into rc-1-0