Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:05:41 +0000 (19:05 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:05:41 +0000 (19:05 +0200)
commit3c0f816b60939e77e81ccbdce43a5027b89dc4a6
tree3c77c452962254cc7662d24e9d8b2eebed8ecd9c
parentca4b93ed723cab84606033100e7a75e842222780
parent0ccd8d1f2414f94a8adb8ce53aa7a2e34fd6dada
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'