From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 6 Apr 2016 20:30:15 +0000 (+0100)
Subject: merging origin/synced/git-annex into git-annex
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ba5cb98480ab7560e34dd95c5bbe6f0719c2787e;p=virt-v2v-test-cases-nonfree.git

merging origin/synced/git-annex into git-annex
---

ba5cb98480ab7560e34dd95c5bbe6f0719c2787e
diff --cc uuid.log
index 0000000,2f2932e..bc217e3
mode 000000,100644..100644
--- a/uuid.log
+++ b/uuid.log
@@@ -1,0 -1,3 +1,4 @@@
++244213da-3a38-4c19-9c7b-fadaf78cfc6d rjones@moo.home.annexia.org:~/d/virt-v2v-test-cases-nonfree timestamp=1459974594.666222s
+ 634ccc92-a730-4494-9503-f5e822fb7fbb trick timestamp=1428581427.073172s
+ baab76c0-62d0-4cea-b63b-6898b2a50eb8 choo timestamp=1428583432.139171s
+ e6e26ddf-dbb4-423d-a7f6-ead24d6ba5b3  timestamp=1428584560.127834s