Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 25 Jul 2010 12:36:35 +0000 (15:36 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 25 Jul 2010 12:36:35 +0000 (15:36 +0300)
commitf05aeb24f0a5ca02ae8f96d10f3e5b84ee8cd86d
tree3d36dd0beae2c06ba4913d85525dd9ac036b25b5
parent9c72b324aaef695a83719ab7fdde4c487e68e5c7
parentf60724df0f2a635ef1eeb4b8522059feed5e0236
Merge remote branch 'origin/master' into fruitiex/fruitbalance