merging origin/git-annex into git-annex
authorRichard W.M. Jones <rjones@redhat.com>
Thu, 9 Apr 2015 12:44:34 +0000 (13:44 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Thu, 9 Apr 2015 12:44:34 +0000 (13:44 +0100)
1  2 
uuid.log

diff --cc 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