Merge remote branch 'origin/master' into fruitiex/gakarmor
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 17:12:07 +0000 (20:12 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 17:12:07 +0000 (20:12 +0300)
commit646837a15ec6b925c05d4740722d48e098ef2492
tree05c3a63ca2bcd20fc43ebc596c59dd05b30fdb29
parent6eafd240bddfbfc14be5a8e17b91ba861bd86ff3
parent6d9605e3a54e5a18274fb3b642677a80865be9a6
Merge remote branch 'origin/master' into fruitiex/gakarmor