# HG changeset patch
# User veltr
# Date 1381145529 -7200
# Node ID e2043b49682d1833eab3281f63bb5f13acb05a99
# Parent  823c898f538aa1e96721c77b1b9a5aec2a7fd743# Parent  63159575945d1f1020721dbbe2a9945ceed4bf26
Merge with 63159575945d1f1020721dbbe2a9945ceed4bf26

diff -r 823c898f538a -r e2043b49682d .hgtags
--- a/.hgtags	Mon Oct 07 13:30:52 2013 +0200
+++ b/.hgtags	Mon Oct 07 13:32:09 2013 +0200
@@ -32,3 +32,4 @@
 aa87747487cefe922b64a1a552b49fe974e33105 V00.12
 33a82766e9f964e05e3a75fb260e6f4e4aa92784 V00.13
 e643f31ed0464510512ff33a70146fde4c093394 V00.14
+500e8af5c1e568689ffa984480e463caaa43d4fe V00.15
diff -r 823c898f538a -r e2043b49682d .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Mon Oct 07 13:30:52 2013 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Mon Oct 07 13:32:09 2013 +0200
@@ -4,6 +4,7 @@
 encoding//src/core/models/term.py=utf-8
 encoding//src/core/settings.py=utf-8
 encoding//src/get_notice_years.py=utf-8
+encoding//src/jocondelab/config.py=utf-8
 encoding//src/jocondelab/management/commands/import_countries.py=utf-8
 encoding//src/jocondelab/management/commands/import_csv.py=utf-8
 encoding//src/jocondelab/management/commands/import_dbpedia_fields.py=utf-8
diff -r 823c898f538a -r e2043b49682d src/jocondelab/__init__.py
--- a/src/jocondelab/__init__.py	Mon Oct 07 13:30:52 2013 +0200
+++ b/src/jocondelab/__init__.py	Mon Oct 07 13:32:09 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 14, 0, "final", 0)
+VERSION = (0, 15, 0, "final", 0)
 
 
 def get_version():