Merge branch 'master' of git://github.com/cmcqueen/ppp
authorPaul Mackerras <paulus@samba.org>
Fri, 1 Aug 2014 11:41:27 +0000 (21:41 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 1 Aug 2014 11:41:27 +0000 (21:41 +1000)
This merges in one commit, which adds the new "stop-bits" option.

Signed-off-by: Paul Mackerras <paulus@samba.org>
1  2 
pppd/pppd.h
pppd/sys-linux.c

diff --cc pppd/pppd.h
Simple merge
Simple merge