Merged changes from fossil-v1

FossilOrigin-Name: 1e30709d8ed7635a10080655c65e51ac9cde2706
2015-07-23 13:05:55 +00:00
parent 9146737d59 f6a1cdfbdd
commit 35dce82ad4
10 changed files with 1487 additions and 64 deletions
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2a08cf305f24922fac8c70654d652b6477ee7b4
+1e30709d8ed7635a10080655c65e51ac9cde2706