]> git.ozlabs.org Git - ppp.git/commitdiff
Merge branch 'master' of git://github.com/pprindeville/ppp
authorPaul Mackerras <paulus@samba.org>
Fri, 14 Aug 2015 10:28:39 +0000 (20:28 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 14 Aug 2015 10:28:39 +0000 (20:28 +1000)
Signed-off-by: Paul Mackerras <paulus@samba.org>

Trivial merge