From 9bd3bea90a623867fb1c25adefb7e3426f8fbf1a Mon Sep 17 00:00:00 2001
From: sponge <sponge@mail.i2p>
Date: Sat, 9 May 2009 18:26:03 +0000
Subject: [PATCH]     * merged branches

---
 history.txt                                       | 3 +++
 router/java/src/net/i2p/router/RouterVersion.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/history.txt b/history.txt
index 4d4303b206..962ff73c14 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2009-05-09 sponge
+    * merge
+
 2009-05-09 sponge
     * fixed OOM on lock (woops! my bad!)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 26a3c95e36..c0f2d3825f 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 11;
+    public final static long BUILD = 12;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;