Prepare for merge

history.txt

@@ -1,3 +1,8 @@
+2012-07-19 zab
+* Streaming:
+  - initialize streaming RTT from sample, trac #979, RFC 6298
+  - store rttDev in TCBCache
+
 * 2013-07-15 0.9.7 released
 
 2013-07-11 kytv

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
-    public final static String EXTRA = "-979";
+    public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);