summaryrefslogtreecommitdiff
path: root/.gnupg
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-10-16 19:09:42 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-10-16 19:09:42 -0400
commit1ff883371700757696efafefe266572776ac9558 (patch)
treed2104f7f405f4fe7a8957e86f53300ee6d4b1aeb /.gnupg
parent3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (diff)
parent3515a46d330af1d09bf1e0b963c13a86c2dbe8a8 (diff)
Merge branch 'master' into build64-par
Conflicts: .login-daemons
Diffstat (limited to '.gnupg')
0 files changed, 0 insertions, 0 deletions