Merge remote-tracking branch 'repoze/master' into 'rename-file'

* repoze/master: Add changelog entry for #6
repoze · Jan 28, 2015 · 6df9712 · 6df9712
2 parents b8196d7 + 451ea46
commit 6df9712
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.2 - (unreleased)
+------------------
+
+- Add a new ``repoze.filesafe.rename_file`` function to move files.
+
+
 2.1 - (2014-05-06)
 ------------------