Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 31 Jul 2010 16:50:09 +0000 (19:50 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 31 Jul 2010 16:50:09 +0000 (19:50 +0300)
commit46e898d5733e900cb3120df4f96130651ccc241a
tree2f677f5d5b9ec022c3e9c5af93425c3bdae4ec3b
parent37703528009a056634d0edb5a969f6d7a7e9b870
parenta1b0c63d0a2dff4bd66b97035180bed9f48122d7
Merge remote branch 'origin/master' into fruitiex/fruitbalance