Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 10:18:10 +0000 (12:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 10:18:10 +0000 (12:18 +0200)
commitc2aaf35ba7cfc2267e90a7b272818a95f2c8a653
treec7c0d535c936785f733644199320f0cf9fe13f50
parentc50c892a7895b8a90e948003b7013ac06c6163f8
parent2becc7fd2baeff230b9b8f439136377d75280373
Merge remote branch 'origin/fruitiex/fruitbalance'