Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 12:04:13 +0000 (15:04 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 12:04:13 +0000 (15:04 +0300)
commitfa51f49b0ea8f1d6cd378b9be83cfcbd8f37c298
tree85de2193123f385957db7ad981dfc49bbc16ceed
parent80e6b68ddc210f337cae2cee7fdd694ffeb2f19a
parent328e88c22c6dd30e5b09da92c0cbc4db029e3955
Merge remote branch 'origin/master' into fruitiex/fruitbalance