commit ffc5bcede882dca26a300a1b881609e0f2fa82e0 Merge: afa171f 5afcb17 Author: Jon Ciesla <limburgher at gmail.com> Date: Thu May 23 09:29:24 2013 -0500 Merge branch 'el6' into el5 openvpn.spec | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) ---