From: Paul Mackerras <paulus@samba.org>
Date: Fri, 1 Aug 2014 11:41:27 +0000 (+1000)
Subject: Merge branch 'master' of git://github.com/cmcqueen/ppp
X-Git-Tag: ppp-2.4.7~1
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=f8c05f21cc743132fb7c4b996568c09a374725b9

Merge branch 'master' of git://github.com/cmcqueen/ppp

This merges in one commit, which adds the new "stop-bits" option.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

f8c05f21cc743132fb7c4b996568c09a374725b9