Merge branch 'release/6.0.1' into develop

klen · Jul 23, 2014 · 0aea5ff · 0aea5ff
2 parents a901334 + 1926937
commit 0aea5ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,8 @@
+2014-07-23  horneds
+
+	* Fix mercurial hook installation (c) MrShark
+	* Version 6.0.1
+
 2014-07-01  horneds
 
 	* Add sorting (--sort)

diff --git a/pylama/__init__.py b/pylama/__init__.py
@@ -5,7 +5,7 @@
 
 """
 
-__version__ = "6.0.0"
+__version__ = "6.0.1"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"