Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 20:13:31 +0000 (21:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 20:13:31 +0000 (21:13 +0100)
commit3977ea84ad5aec855e191af400ec8a31f6f4933a
treeffa5dba4c3b426fbd9fc4e26245b6069edfc63b9
parenta3147c2e5642ce132e0d6bc3952718dd8acfc84a
parentb901f5d50c89178425bd3931350d8be7dc6789fb
Merge remote branch 'origin/fruitiex/balance'