diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-13 20:02:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-13 20:02:48 -0400 |
| commit | a7cb2b7baf26d2dd488259164eae675fb70a8b43 (patch) | |
| tree | 3353b6e53791dd2f453dda77f72ebb56e74cbe90 /doc/testimonials/comment_1_2bf439f7a3bc3d6fab91849017946182._comment | |
| parent | b97bf1a13227bbfb428becc058797fbd0bf72f8e (diff) | |
| parent | dec6d9076b51de0c044be78d8a1e25d80bb20a85 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
doc/polls/2013/direct_vs_indirect_mode.mdwn
doc/polls/2013/number_of_repositories.mdwn
doc/polls/2013/using_for.mdwn
Diffstat (limited to 'doc/testimonials/comment_1_2bf439f7a3bc3d6fab91849017946182._comment')
0 files changed, 0 insertions, 0 deletions