Merge remote-tracking branch 'speedprog/banByIp'
authorPerttu Ahola <celeron55@gmail.com>
Fri, 12 Aug 2011 08:55:51 +0000 (11:55 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Fri, 12 Aug 2011 08:55:51 +0000 (11:55 +0300)

Trivial merge