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)
commita697da48530c1938206914872d6e7ac252a3e639
tree123833fe881ad195c1b1d0cbfe19406647f72d85
parent8138d21582cfb43fd7462560e858e71ce2c9a9c3
parent292945655ea4be295221d179530b98e4f391c726
Merge branch 'feature/4545_remove-misleading-encryption-information-from-wizard' into develop