merging origin/git-annex into git-annex

diff --git a/7dd/fa9/SHA256E-s5120--1e3b07ae385435af8a7bf677db30edbd8a658b96f2b9b4478abaf15e6faea31b.log b/7dd/fa9/SHA256E-s5120--1e3b07ae385435af8a7bf677db30edbd8a658b96f2b9b4478abaf15e6faea31b.log
index 8c0002cc1fbd782d85ca5a11ae1e29e3518310b8..6df659aabc98aac255123dc01f8232fdf34cf2d7 100644 (file)
--- a/7dd/fa9/SHA256E-s5120--1e3b07ae385435af8a7bf677db30edbd8a658b96f2b9b4478abaf15e6faea31b.log
+++ b/7dd/fa9/SHA256E-s5120--1e3b07ae385435af8a7bf677db30edbd8a658b96f2b9b4478abaf15e6faea31b.log
@@ -1 +1,3 @@
+1442782475.598701s 1 360a2918-455a-43ce-9773-251c9957b248
 1442782851.721741s 1 42d60941-65bd-4ff2-8e79-4c04618e0ed3
+1442782851.757001s 1 42d60941-65bd-4ff2-8e79-4c04618e0ed3

diff --git a/uuid.log b/uuid.log
index b5115fe6e3403f2ccd7c3572b454c1bed352e1cf..99e399233c5dcb63277d18decdfcb14a0f1fe9d1 100644 (file)
--- a/uuid.log
+++ b/uuid.log
@@ -1 +1,2 @@
+360a2918-455a-43ce-9773-251c9957b248 wsh@steelpick:~/q/testing timestamp=1442782451.322539s
 42d60941-65bd-4ff2-8e79-4c04618e0ed3 git@rtime:/var/gitolite/repositories/testing.git timestamp=1442782845.179551s