Merged folder-state branch

FossilOrigin-Name: cca2042b901945b1079faedaa7339578f6192a3f
2015-07-11 11:50:18 +00:00
parent 0191b4ba5b 9494d54d7e
commit 2ccd05f476
6 changed files with 149 additions and 26 deletions
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ccbdbff89e2354c6d8f38d994587328a04112eaa
+cca2042b901945b1079faedaa7339578f6192a3f