Merge remote-tracking branch 'upstream/master' into filter

2012-09-05 14:08:41 +02:00
parent 74334e665d bd15133e2b
commit 7ba863f43c
25 changed files with 709 additions and 101 deletions
--- a/library/text/parser/uri_template/src/uri_template.e
+++ b/library/text/parser/uri_template/src/uri_template.e
@@ -24,7 +24,7 @@ create {URI_TEMPLATE}
 	make_from_uri_template

 convert
-	make ({READABLE_STRING_8})
+	make ({READABLE_STRING_8, STRING_8})

 feature {NONE} -- Initialization