Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 19:35:32 +0000 (22:35 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 19:35:32 +0000 (22:35 +0300)
commit13ef1ff574dfa739e5c768d5dabaeed6dce7ad17
tree9c708fe9ad652a42980a3af0fedbb2d41571349a
parentc8a8df111823d8a9a5a8ea71296c11745d00fd1a
parent061a3f12e04349b8dc6e05c8d13caa4b4df95136
Merge branch 'master' into fruitiex/fruitbalance