Merge remote-tracking branch 'origin/master'

2013-06-17 09:53:07 +02:00
parent 48aa2c2cec cbd6b40f85
commit 5c39ee5500
16 changed files with 42658 additions and 24892 deletions
@@ -359,12 +359,12 @@ win32 {
 			-lcrypto \
 			-lssh2 \
 			-lgnutls \
-			-lnettle \
 			-lhogweed \
 			-lgmp \
 			-lgcrypt \
 			-lgpg-error \
 			-lgsasl \
+			-lnettle \
 			-lidn \
 			-lintl \
 			-lprotobuf