[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit c0833664cbe627981e67841eb1c7ace7691fddbe
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat May 31 12:49:35 2014 -0400

    fix resolve_defaultroute_one in non-verbose mode

commit c984cdb0647ce9cbdc65188831b2434a9c2b632f
Merge: ffd6b04 598bd55
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat May 31 12:35:29 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	programs/addconn/addconn.c

commit ffd6b0496f40d722a9dc41a30f1299ba126b03bf
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri May 30 11:22:11 2014 -0400

    delte empty line

commit dd05fb028da3701b57e0155c34372f344f38dc35
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 29 19:26:30 2014 -0400

    tidy parts of addconn
    (add a snipit from  Wolfgang Nothdurft)