[openvpn/f21: 5/5] Merge branch 'master' into f21

[Jon Ciesla]

commit 32eb6158bf690514dd968c3ba928107cb54c39fc
Merge: 6e1fe80 e65e79b
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Dec 1 12:45:15 2014 -0600

    Merge branch 'master' into f21
    
    Conflicts:
    	openvpn.spec

 .gitignore   |    4 ++++
 openvpn.spec |   13 ++++++++++---
 sources      |    4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)
---