Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 21:08:35 +0000 (00:08 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 21:08:35 +0000 (00:08 +0300)
commit691b07501cc8efa0c69a6b0b9a4f4e57f14e4b4d
tree7b6f67d3239e4aa73485e65f5a62f1f3ad97bf60
parentfa7c495071c90b1b4ef2a1d681d797dcffcafc76
parenta36e2f5a19303584684bebb89e149e13da121668
Merge branch 'master' into fruitiex/fruitbalance