aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-09-26 15:54:36 -0400
committerJoey Hess <joey@kitenet.net>2013-09-26 15:54:36 -0400
commitc88fec0bc939c422a1cb44567e7f65418b6edc08 (patch)
tree77af31c0f428447379abb73ce7fbad40f38f7961 /COPYING
parent6a0204ead701904418528fe9c3bf93ae15aa3402 (diff)
parent29ed089ccee73925eb34d35f5ebdfb5706a8d7d7 (diff)
downloadgit-remote-gcrypt-c88fec0bc939c422a1cb44567e7f65418b6edc08.tar.gz
Merge branch 'master' into dgit/sid
Conflicts: git-remote-gcrypt
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions