Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 18 Oct 2010 17:20:37 +0000 (19:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 18 Oct 2010 17:20:37 +0000 (19:20 +0200)
commitd3bd5ddddada8dda32a45b8d4cabcfacc9fd685f
tree63dd12eb0555f27f250efde05e3b8c4e5896715e
parentc94ab221045bde4122fd92c7002716eacdfce4cb
parentf288fa95d2c70ae607fdfef6d1fd1738c6f440ca
Merge remote branch 'origin/fruitiex/fruitbalance'