Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 24 Jul 2010 17:26:32 +0000 (19:26 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 24 Jul 2010 17:26:32 +0000 (19:26 +0200)
commitf60724df0f2a635ef1eeb4b8522059feed5e0236
tree159dce8195f9ea16d7334945d6612a3116b7c0e8
parente875a6077cc764d2719b2f4c8e516e4a561bc5d4
parent707b507ca6af727edb07ad82399c455a798de88c
Merge remote branch 'origin/fruitiex/fruitbalance'