Merge remote branch 'origin/diabolik/credits-update'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)
commit997cb76a518f8a50c1cfa41e3f7b3d1489b38937
tree1a1f8975a8863c7519bfe80d41360e1e6f60bc71
parent748284077276887239cbb2f7eecb3aa59f7fedec
parent348a4b32894c2112fde2ee1a15788227e3fb4e81
Merge remote branch 'origin/diabolik/credits-update'