summaryrefslogtreecommitdiff
path: root/doc/news
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 19:52:09 -0400
committerJoey Hess2015-01-04 19:52:09 -0400
commite22002a7a99ceaaf193a6aa83d3c03e256d79f52 (patch)
tree8a6460e3da5abfd0109d40e518fd1a8f233dc35b /doc/news
parent2de60a902794669b40fae8c7135f989ccca2f8d5 (diff)
parent0794dfbd7c6f854c3e517486be0722e4cf61db34 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'doc/news')
0 files changed, 0 insertions, 0 deletions