Merge branch 'master' into SpamServ
authorNurPech <nurpech@nurpech.de>
Sun, 8 Sep 2013 19:12:04 +0000 (21:12 +0200)
committerNurPech <nurpech@nurpech.de>
Sun, 8 Sep 2013 19:12:04 +0000 (21:12 +0200)

Trivial merge