Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 20:02:05 +0000 (23:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 20:02:05 +0000 (23:02 +0300)
commit32bdfa0f68b705420eaab0128a400c42ca687c06
tree70dc2cba6dc468173b4dd5525b59e09d713e92fc
parent8b8fc1108035c41379f315058b69b85e1cce0c0f
parent9eb82b0cb9ae1dd3b2ae43b24f121e278e6eb310
Merge remote branch 'origin/master' into fruitiex/fruitbalance