[NetworkManager-openvpn: 3/5] Merge remote-tracking branch 'origin/f21'

[Lubomir Rintel]

commit 1c7b1a0ea4b6f48ba90591cda82474725ba2f2b0
Merge: b23e2ff d120416
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Nov 11 17:09:10 2014 +0100

    Merge remote-tracking branch 'origin/f21'
    
    Align with f21. It has an extra patch and fixed release number.
    
    Conflicts:
    	NetworkManager-openvpn.spec

 NetworkManager-openvpn.spec   |   11 +++-
 fix-gui-certs-selection.patch |  160 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 169 insertions(+), 2 deletions(-)
---