Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 10:06:16 +0000 (13:06 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 10:06:16 +0000 (13:06 +0300)
commit19b6e4fe0563a322e4f2295d4c535933a9834f09
treee3a6cb1836960c20e9d41316c5e63d41b263fd7a
parent3a4f3e582789ab474da656d6faa422ffa213099e
parent492ce9db43777b865d647f6303fc7ede3cceb5f7
Merge remote branch 'origin/master' into fruitiex/fruitbalance