Merge branch 'master' into ti

2014-07-01 12:00:15 -07:00
parent e145e978e1 d875931a3f
commit 599da85d9e
1 changed files with 4 additions and 2 deletions
--- a/certs/include.am
+++ b/certs/include.am
@ -26,13 +26,15 @@ EXTRA_DIST += \

 EXTRA_DIST += \
 	     certs/ca-key.der \
+	     certs/ca-cert.der \
 	     certs/client-cert.der \
 	     certs/client-key.der \
 	     certs/dh2048.der \
 	     certs/rsa2048.der \
 	     certs/dsa2048.der \
-	     certs/ecc-key.der
-
+	     certs/ecc-key.der \
+	     certs/server-key.der \
+	     certs/server-cert.der

 dist_doc_DATA+= certs/taoCert.txt