Merge branch 'master' into rc-0-9
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Wed, 23 Mar 2011 11:58:32 +0000 (12:58 +0100)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Wed, 23 Mar 2011 11:58:32 +0000 (12:58 +0100)
commit190c25562b051fbef089b8f0cc1e155d9e7aab64
tree908c84e7822e195135d00350314c962e6aefff88
parent6d24cfb498e1f5230b7b34aca4547cb6bfee0015
parent1e188f4cc5b61ebb3dc3f946b33f75ea15852bf7
Merge branch 'master' into rc-0-9