Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)
commite4a7633b12efcba95ceb2300d06e1413f3799ef9
tree253646be857f3abf29371609be775222a56dce19
parent1216175333a1129260067a4f3ef26e9b43336ded
parent58f3211a938e0c2d2d26fe834f967c746fcc8754
Merge branch 'master' into fruitiex/fruitbalance