merge and fix iperf latency bug
diff --git a/web/ons-demo/RELEASE_NOTES.txt b/web/ons-demo/RELEASE_NOTES.txt
index 08e6ba0..c0e729f 100644
--- a/web/ons-demo/RELEASE_NOTES.txt
+++ b/web/ons-demo/RELEASE_NOTES.txt
@@ -1,3 +1,7 @@
+** April 8, 2013 **
+- merge from master
+- fix gradually increasing latency of iperf data display
+
 ** April 4, 2013 **
 - denser iperf display
 - don't pop alert on command error response. just log it