From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 9 Apr 2015 12:44:34 +0000 (+0100)
Subject: merging origin/git-annex into git-annex
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=407baf25babbb894089ad76784f751e02e81dee0;p=virt-v2v-test-cases-nonfree.git

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

407baf25babbb894089ad76784f751e02e81dee0
diff --cc uuid.log
index 9587de5,ae6b685..818fdff
--- a/uuid.log
+++ b/uuid.log
@@@ -1,1 -1,1 +1,2 @@@
+ 634ccc92-a730-4494-9503-f5e822fb7fbb trick timestamp=1428581427.073172s
 +baab76c0-62d0-4cea-b63b-6898b2a50eb8 choo timestamp=1428583432.139171s