Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)
commitfbf4bf11285d7ccb0335f451e062fa36b5e5e978
treef3d8be948075409015a287200a068c7d7de07a23
parent9c510c1de7ddcf81bd9b5f0ce016fb9fbbcd8eca
parent11038d9b924df06ebbdd5bb850186ca112becc39
Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance