# HG changeset patch
# User cavaliet
# Date 1372239342 -7200
# Node ID ce5cdc22fbe48a7f37403003594b616b7d632637
# Parent  b163a938e9c3856957a91d8d8e000e5d530b880d# Parent  1da0c1382b07d7021f48e26321b88a3dec384a42
Merge with 1da0c1382b07d7021f48e26321b88a3dec384a42

diff -r 1da0c1382b07 -r ce5cdc22fbe4 .hgtags
--- a/.hgtags	Wed Jun 26 11:22:20 2013 +0200
+++ b/.hgtags	Wed Jun 26 11:35:42 2013 +0200
@@ -16,3 +16,6 @@
 50ae6a9e30fcd3bfada93733bab575c041755439 V00.01.11
 29d3f2cf48c20cfce1a291646d1045ce4f2112c7 V00.01.12
 eaf16c330dd1b10484576789562518a4865ced4c V00.01.13
+a28157efa20a19919c827674dd55102ddab8d46a V00.01.14
+a28157efa20a19919c827674dd55102ddab8d46a V00.01.14
+0000000000000000000000000000000000000000 V00.01.14
diff -r 1da0c1382b07 -r ce5cdc22fbe4 src/aixweb/__init__.py
--- a/src/aixweb/__init__.py	Wed Jun 26 11:22:20 2013 +0200
+++ b/src/aixweb/__init__.py	Wed Jun 26 11:35:42 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 1, 13, "final", 0)
+VERSION = (0, 1, 14, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 1da0c1382b07 -r ce5cdc22fbe4 src/requirement.txt
--- a/src/requirement.txt	Wed Jun 26 11:22:20 2013 +0200
+++ b/src/requirement.txt	Wed Jun 26 11:35:42 2013 +0200
@@ -1,2 +1,2 @@
 ldt (==1.50.4)
-metadatacomposer (==0.1.12)
\ No newline at end of file
+metadatacomposer (==0.1.13)
\ No newline at end of file