Merge remote branch 'origin/fruitiex/gakarmor'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:16:05 +0000 (19:16 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:16:05 +0000 (19:16 +0200)
commit4917df1ef0f9edb11438d504e5ed1caee5136437
treec872093085aeba4ebb79b2e3308bd2c2a305a6a6
parentd43d6555e165f78d86f5a47ebdf6be08c29c70df
parent6eafd240bddfbfc14be5a8e17b91ba861bd86ff3
Merge remote branch 'origin/fruitiex/gakarmor'