Merge remote branch 'origin/fruitiex/fruitcampaign'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:52:52 +0000 (21:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:52:52 +0000 (21:52 +0100)

Trivial merge