Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)
commit828bd15b179b231a7d6b8a4401cd2a302d7e6189
tree50ec262b74b531be5d183fba41bcd1483af3ae4f
parenta7af3e77752583c8c0c0bdc53a00d559c14c3cfb
parent57fc749c7a6549d2d3e6ff79779ecb7400767410
Merge remote branch 'origin/fruitiex/fruitbalance'