From 343035e172cdac3ea2e2008b1c57e118d6d0e689 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Thu, 5 Mar 2015 23:13:26 +0000
Subject: [PATCH 1/2] Explain in webadmin why encoding settings are disabled.

---
 modules/data/webadmin/tmpl/encoding_settings.tmpl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/data/webadmin/tmpl/encoding_settings.tmpl b/modules/data/webadmin/tmpl/encoding_settings.tmpl
index f292c70b..543ef6d1 100644
--- a/modules/data/webadmin/tmpl/encoding_settings.tmpl
+++ b/modules/data/webadmin/tmpl/encoding_settings.tmpl
@@ -1,4 +1,9 @@
 <div class="encoding-settings">
+	<? IF EncodingDisabled ?>
+	<div>
+		ZNC is compiled without encodings support. <a href="http://icu-project.org/">ICU</a> is required for it.
+	</div>
+	<? ENDIF ?>
 	<div>
 		<div class="checkboxandlabel checkbox">
 			<input type="radio" name="encoding_utf" id="encoding_utf_legacy" value="legacy" <? IF EncodingUtf == "legacy" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />

From 682e3648322684b932a48cb95aab294d3584ef16 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Fri, 6 Mar 2015 20:56:10 +0000
Subject: [PATCH 2/2] Travis: disable parallelism.

ASan crashes so often, probably because of lack of RAM :(
Slow build is more useful than what we have now.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 854ebeab..7ede6176 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ script:
     - cd build
     - ../configure --enable-perl --enable-python --enable-tcl --enable-cyrus --enable-charset $CFGFLAGS CXXFLAGS="$CXXFLAGS $MYCXXFLAGS" LDFLAGS="$LDFLAGS $MYLDFLAGS"
     - cat config.log
-    - make V=1 -j3
+    - make V=1
     - make V=1 test
     - sudo make install
     - cd ..