summaryrefslogtreecommitdiff
path: root/.gnupg
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-08-27 15:20:39 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-08-27 15:20:39 -0400
commit3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (patch)
tree584c6b0c0e8b1041e2c9483e218b035cb02d1eee /.gnupg
parentad482d55d2f60cf3c91c9014b934af7ea30b4d88 (diff)
parentd794d461f2e91af847beed7783cde2c7e65fd725 (diff)
Merge branch 'master' into build64-par
Conflicts: .login-daemons
Diffstat (limited to '.gnupg')
0 files changed, 0 insertions, 0 deletions