Merge branch 'release/0.8.0' into develop

klen · Jun 15, 2014 · 13028f9 · 13028f9
2 parents 2f4c88d + dba75d6
commit 13028f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Changelog b/Changelog
@@ -1,7 +1,10 @@
+2014-06-15  horneds
+
+	* Supports hyphens
+
 2014-06-08  horneds
 
 	* Supports continuation values
-	* Version 0.7.0
 
 2014-05-05  horneds
 

diff --git a/inirama.py b/inirama.py
@@ -16,6 +16,13 @@
 """
 from __future__ import unicode_literals, print_function
 
+
+__version__ = "0.8.0"
+__project__ = "Inirama"
+__author__ = "Kirill Klenov <horneds@gmail.com>"
+__license__ = "BSD"
+
+
 import io
 import re
 import logging
@@ -66,12 +73,6 @@ def keys(self):
     iteritems = DictMixin.iteritems
 
 
-__version__ = "0.7.0"
-__project__ = "Inirama"
-__author__ = "Kirill Klenov <horneds@gmail.com>"
-__license__ = "BSD"
-
-
 NS_LOGGER = logging.getLogger('inirama')