Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 23:36:14 +0000 (02:36 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 23:36:14 +0000 (02:36 +0300)
commit72fd26e05143a2e69e55239e6972bcf3cba86ba7
tree711309759f9f48d6f6933e349147594305bbf957
parentcb7498be766e4df7ea2eaba3a4c47cf5d4ed3943
parent7f052d0b351f6925ed9a1d6025d6efceb77ebc22
Merge branch 'master' into fruitiex/fruitbalance