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)
commit8a66bf5912e1090ca90ca2b4e8cc1ef129e8ac79
treeb2c36e9857453fe2934489b68c8e9e6f6ab6a090
parentf2eeb227d272f00d7d96f14b1f178656112f3292
parent1eebbfcad803f25681f777c70f97602e2ef295f0
Merge branch 'bug/support_nicknym_potential_problems' into develop