Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 17 Jul 2010 15:02:52 +0000 (18:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 17 Jul 2010 15:02:52 +0000 (18:02 +0300)
commit3233dc7af731e4894176b9a317b09ff19090eb21
tree2b86d43961bd63b3989cb8dfe5bf22cdb58c81ca
parent99ab756478d813695913e72b5ac033eaee78d0d0
parentd9a92ac66e5fd03335a0150e763c3def4b558c8b
Merge remote branch 'origin/master' into fruitiex/fruitbalance