Merge remote branch 'origin/fruitiex/gakarmor'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:03:29 +0000 (20:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:03:29 +0000 (20:03 +0200)
commit4c4cb17a6d750a957ade68c0ffddc269b643cb2a
tree7f658ba0d4f41dccb2fd4bcfecbb37817798a73e
parent392daf627bb137aadf4c156dc8dfc4906475840e
parent646837a15ec6b925c05d4740722d48e098ef2492
Merge remote branch 'origin/fruitiex/gakarmor'