[xl2tpd/epel7: 3/3] Merge branch 'master' into epel7

[Paul Wouters]

commit d0850497c153b7f62cb91c5349487655181971b4
Merge: cf72700 ddc290b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Aug 25 16:52:55 2014 -0400

    Merge branch 'master' into epel7

 xl2tpd.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---