Fold in changes

1 files changed, 6 insertions, 1 deletions

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.