Merge remote branch 'origin/fruitiex/campaign'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 18 Dec 2010 20:16:13 +0000 (21:16 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 18 Dec 2010 20:16:13 +0000 (21:16 +0100)

Trivial merge