From c51d8a7a9a7f7c801a3a310ec314506cdde7a11b Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mar 09 2011 22:59:21 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/openconnect


Conflicts:
	openconnect.spec

---

diff --git a/openconnect.spec b/openconnect.spec
index 053656b..38e232a 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -64,8 +64,17 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Mar  9 2011 David Woodhouse <David.Woodhouse@intel.com> - 3.00-1
 - Update to 3.00.
 
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.26-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Nov 21 2010 David Woodhouse <David.Woodhouse@intel.com> - 2.26-4
+- Fix bug numbers in changelog
+
+* Wed Sep 29 2010 jkeating - 2.26-3
+- Rebuilt for gcc bug 634757
+
 * Wed Sep 22 2010 David Woodhouse <David.Woodhouse@intel.com> - 2.26-1
-- Update to 2.26. (#629797: SIGSEGV in nm-openconnect-auth-dialog)
+- Update to 2.26. (#629979: SIGSEGV in nm-openconnect-auth-dialog)
 
 * Thu Aug 12 2010 David Woodhouse <David.Woodhouse@intel.com> - 2.25-2
 - Rebuild for new libproxy