Merge tag 'upstream/2.17'
authorBdale Garbee <bdale@gag.com>
Sun, 9 Mar 2014 20:24:12 +0000 (14:24 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 9 Mar 2014 20:24:12 +0000 (14:24 -0600)
commiteecb0a54d7bbb6d7f1085cad3e663164baad4c4f
tree66e7bb390e261f86942c1d547e599ab6413e2b0d
parent8492868e509aea5fabb369300636dccacbc91d02
parentedf600144998d1a1e09898548938cc11b95c10bc
Merge tag 'upstream/2.17'

Upstream version 2.17

Conflicts:
Makefile.in
cpm.5.in
cpm.5.in
cpmls.c
fsck.cpm.1.in
fsed.cpm.1.in