commit bc153ca658a8d6845e5154a59fc0f75ae044c2de Merge: e145d29 e38dc05 Author: Orion Poplawski <orion at nwra.com> Date: Wed May 29 12:16:40 2013 -0600 Merge branch 'master' into gnustep openvpn-auth-ldap.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---