Merge commit 'origin/R3_3_branch'

Conflicts:

	cs/demo/WCF/latency/Client.cs
	cs/demo/WCF/latency_m/Client.cs
	cs/demo/WCF/throughput/Client.cs
	cs/demo/WCF/throughput_m/Client.cs
	cs/demo/WCF/throughput_m/Service.cs
	java/demo/Database/library/BookI.java
	java/demo/Database/library/BookQueryResultI.java
	java/demo/Database/library/Client.java
	java/demo/Database/library/ConnectionPool.java
	java/demo/Database/library/DispatchInterceptorI.java
	java/demo/Database/library/Glacier2Session.ice
	java/demo/Database/library/Glacier2SessionManagerI.java
	java/demo/Database/library/Grammar.java
	java/demo/Database/library/Library.ice
	java/demo/Database/library/LibraryI.java
	java/demo/Database/library/Parser.java
	java/demo/Database/library/ReapThread.java
	java/demo/Database/library/RunParser.java
	java/demo/Database/library/SQLRequestContext.java
	java/demo/Database/library/Scanner.java
	java/demo/Database/library/Server.java
	java/demo/Database/library/Session.ice
	java/demo/Database/library/SessionFactoryI.java
	java/demo/Database/library/SessionI.java
	java/demo/Database/library/Token.java
	java/demo/Database/library/build.xml
	java/demo/Database/library/config.client

1 files changed, 2 insertions, 2 deletions

diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 6db12d27cc2..4d9b5488691 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -343,13 +343,13 @@ public final class Util
     public static String
     stringVersion()
     {
-        return "3.3.0"; // "A.B.C", with A=major, B=minor, C=patch
+        return "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch
     }
 
     public static int
     intVersion()
     {
-        return 30300; // AABBCC, with AA=major, BB=minor, CC=patch
+        return 30301; // AABBCC, with AA=major, BB=minor, CC=patch
     }
 
     private static String _localAddress = null;