[openvpn/f20: 8/8] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openvpn into f20

[Jon Ciesla]

commit 18089bf9e1cfedf2fe7552104100a35d1deef404
Merge: 18b1f95 9bcd1ce
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Dec 2 14:35:28 2014 -0600

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openvpn into f20
    
    Conflicts:
    	openvpn.spec

 openvpn.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc openvpn.spec
index 44457e0,5e0fbb9..bebd4b0
--- a/openvpn.spec
+++ b/openvpn.spec
@@@ -212,16 -211,10 +212,21 @@@ f
  %config %dir %{_sysconfdir}/%{name}/
  
  %changelog
 +* Mon Dec 01 2014 Jon Ciesla <limburgher at gmail.com> 2.3.6-1
 +- 2.3.6, CVE-2014-8104.
 +
 +* Fri Nov 21 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.3.5-2
 +- Rework package doc handling (RHBZ #1165004).
 +
 +* Tue Oct 28 2014 Jon Ciesla <limburgher at gmail.com> 2.3.5-1
 +- 2.3.5.
 +
 +* Tue Aug 26 2014 Jan Vcelak <jvcelak at fedoraproject.org> 2.3.4-4
++
+ * Fri Nov 21 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.3.2-7
+ - Rework package doc handling (RHBZ #1165004).
+ 
+ * Tue Aug 26 2014 Jan Vcelak <jvcelak at fedoraproject.org> 2.3.2-6
  - Enable systemd support.
  
  * Sun Jan 19 2014 Ville Skyttä <ville.skytta at iki.fi> - 2.3.2-5