Merge branch 'feature/4545_remove-misleading-encryption-information-from-wizard'...
authordrebs <drebs@leap.se>
Mon, 23 Dec 2013 16:22:58 +0000 (14:22 -0200)
committerdrebs <drebs@leap.se>
Mon, 23 Dec 2013 16:22:58 +0000 (14:22 -0200)

Trivial merge