From 936e7a94cb6eb6fec5aeeb2438af525981e68794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 12 Jul 2013 14:46:19 -0300
Subject: Fold in changes

---
 CHANGELOG                           | 7 ++++++-
 changes/bug2895_improve_leap_assert | 2 --
 changes/consider_osx_tempdirs       | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 changes/bug2895_improve_leap_assert
 delete mode 100644 changes/consider_osx_tempdirs

diff --git a/CHANGELOG b/CHANGELOG
index 5f9cb69..a6918b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
-0.2.2 Jun 28:
+0.2.6 Jul 12:
+  o Improve leap_assert so that it only prints the traceback from the
+    leap_assert call up. Closes #2895
+  o Add OSX temp directories to the basetests class.
+
+0.2.5 Jun 28:
   o Bugfix: use the provider's default language as default
     string. Also take care (and note) a possible case with a
     problematic provider misconfiguration. Closes #3029.
diff --git a/changes/bug2895_improve_leap_assert b/changes/bug2895_improve_leap_assert
deleted file mode 100644
index 8caea7e..0000000
--- a/changes/bug2895_improve_leap_assert
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Improve leap_assert so that it only prints the traceback from the
-    leap_assert call up. Closes #2895
\ No newline at end of file
diff --git a/changes/consider_osx_tempdirs b/changes/consider_osx_tempdirs
deleted file mode 100644
index 5cc20fb..0000000
--- a/changes/consider_osx_tempdirs
+++ /dev/null
@@ -1 +0,0 @@
-  o Add OSX temp directories to the basetests class.
\ No newline at end of file
-- 
cgit v1.2.3


From 9bd0262664a5cc50957646908af8fe7c92b00cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 12 Jul 2013 14:47:17 -0300
Subject: Bump version to 0.2.6

---
 setup.py                    | 2 +-
 src/leap/common/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index bdf97c5..9b57aa7 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
     name='leap.common',
     # If you change version, do it also in
     # src/leap/common/__init__.py
-    version='0.2.5',
+    version='0.2.6',
     url='https://leap.se/',
     license='GPLv3+',
     author='The LEAP Encryption Access Project',
diff --git a/src/leap/common/__init__.py b/src/leap/common/__init__.py
index 2b30715..abeff0f 100644
--- a/src/leap/common/__init__.py
+++ b/src/leap/common/__init__.py
@@ -16,4 +16,4 @@ except ImportError:
 
 __all__ = ["certs", "check", "files", "events"]
 
-__version__ = "0.2.5"
+__version__ = "0.2.6"
-- 
cgit v1.2.3