Merge branch 'master' into master-2

# Conflicts: # LICENSE
2015-03-27 00:06:28 +01:00
parent 8f42134415
commit 7cf755493c
29 changed files with 669 additions and 0 deletions
--- a/test/service/webservice/cgi-bin/test.html
+++ b/test/service/webservice/cgi-bin/test.html
@@ -0,0 +1,7 @@
+<html>
+  <Title>Hello in HTML</Title>
+<body>
+  <p>Hello There!</p>
+  <p><b>Hi There!</b></p>
+</body>
+</html>