Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 25 Jun 2010 18:43:06 +0000 (21:43 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 25 Jun 2010 18:43:06 +0000 (21:43 +0300)
commit8a13a6d2d6e42485015dee9c1c910e6ed9b46cdf
tree545a347e27ef3d406bd57488506fc6f015e9810c
parenta8ff6e23ecb96ea872cfa7610fad158df8597e1f
parentce6e50e11b71814a12aae0ef1800e550fa6a73c2
Merge branch 'master' into fruitiex/fruitbalance

Conflicts:
balance.cfg
balance.cfg