Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 28 Oct 2010 18:14:14 +0000 (21:14 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 28 Oct 2010 18:14:14 +0000 (21:14 +0300)
commiteaa1f1ae886372197b34ae4a333c7ab2072edf55
treeefcae2f28e098413c4602daa9a4c71840cec3d45
parent36c39e8c72c863b2e992486883b647948272dbdf
parentfc7c59755079219daf58463ba14c5d7dcdb51da3
Merge remote branch 'origin/master' into fruitiex/fruitbalance