Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 21 Jul 2010 09:02:18 +0000 (12:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 21 Jul 2010 09:02:18 +0000 (12:02 +0300)
commitcdab827c3bb824ae263c1add2b551d76f524ef77
tree726556c28d2de3015e922a95bbaa5f58c8ceed0a
parent96c3280cdcffff9511c8c99c62ed522ae0481f4d
parent86f854c164cb22b010fc54cf0943bf4a9682c255
Merge branch 'master' into fruitiex/fruitbalance