[openvpn-auth-ldap/f15: 4/4] Merge branch 'master' into f15

[Matthias Saou]

commit 23505069ecbcbf477ffe7fcddb910e4ff2716b1f
Merge: fa51bc3 0ee2b24
Author: Matthias Saou <matthias at saou.eu>
Date:   Sun Aug 21 11:34:09 2011 +0200

    Merge branch 'master' into f15

 auth-ldap-2.0.3-tools-CFLAGS.patch |   11 +++++++++++
 openvpn-auth-ldap.spec             |   36 +++++++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 13 deletions(-)
---