Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:51:12 +0000 (19:51 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:51:12 +0000 (19:51 +0300)
commit1216175333a1129260067a4f3ef26e9b43336ded
treed80ec6ed8d83bd9e7251e1a8c331d54738eb84b8
parent6480ab16fb16116782907a9301c97b321ae8b0b5
parent1d02cfb4987420c6f2ebf94d13cbbed575e78bdb
Merge remote branch 'origin/master' into fruitiex/fruitbalance