Fold in changes

diff --git a/CHANGELOG b/CHANGELOG
index 5f9cb69..a6918b9 100644 (file)
--- 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 (file)
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 (file)
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