Merge branch 'bug/support_nicknym_potential_problems' into develop
authordrebs <drebs@leap.se>
Thu, 8 Aug 2013 21:37:37 +0000 (23:37 +0200)
committerdrebs <drebs@leap.se>
Thu, 8 Aug 2013 21:37:37 +0000 (23:37 +0200)

Trivial merge