From ba94500c1006fd6c60e984188f2a2edc900366ec Mon Sep 17 00:00:00 2001
From: Jesse Young <youngj@envaya.org>
Date: Thu, 29 Sep 2011 16:14:02 -0700
Subject: [PATCH] update to 2.0-rc2

---
 .phrozn/entries/history/index.twig   | 13 +++++++++++++
 .phrozn/entries/serverapi/index.twig |  5 +++++
 history/index.html                   | 15 ++++++++++++++-
 serverapi/index.html                 |  5 +++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.phrozn/entries/history/index.twig b/.phrozn/entries/history/index.twig
index 1a0291f..1cb0bef 100755
--- a/.phrozn/entries/history/index.twig
+++ b/.phrozn/entries/history/index.twig
@@ -1,6 +1,19 @@
 id: history
 title: History
 ---
+
+Version 2.0-rc2 (2011/09/29)
+
+<ul>
+    <li>
+        Automatic failover between Wi-Fi and mobile data connection if server is unreachable
+        (e.g. when Wi-Fi router is on, but it has no internet access)
+    </li>
+    <li>
+        Send timestamp of incoming messages to server
+    </li>    
+</ul>
+
 Version 2.0-rc1 (2011/09/28)
 
 <ul>
diff --git a/.phrozn/entries/serverapi/index.twig b/.phrozn/entries/serverapi/index.twig
index e4711fb..1cd5ab4 100755
--- a/.phrozn/entries/serverapi/index.twig
+++ b/.phrozn/entries/serverapi/index.twig
@@ -264,6 +264,11 @@ Additional parameters sent in POST requests with <code>action=incoming</code>:
         The message body of the SMS, or the content of the <code>text/plain</code> part of the MMS.
         For multipart SMS messages, this field contains all parts concatenated and may be longer than 160 characters.
     </dd>
+    
+    <dt>"timestamp" ::= &lt;long integer&gt;</dt>
+    <dd>
+        The timestamp of the incoming message, in milliseconds since midnight, January 1, 1970 UTC.
+    </dd>    
 </dl>
         
 Additional parameters sent in POST requests with <code>action=incoming</code> and <code>message_type=mms</code>:
diff --git a/history/index.html b/history/index.html
index dde9a7b..8366490 100755
--- a/history/index.html
+++ b/history/index.html
@@ -39,7 +39,20 @@
     
     <h2>History</h2>
   
-    Version 2.0-rc1 (2011/09/28)
+    
+Version 2.0-rc2 (2011/09/29)
+
+<ul>
+    <li>
+        Automatic failover between Wi-Fi and mobile data connection if server is unreachable
+        (e.g. when Wi-Fi router is on, but it has no internet access)
+    </li>
+    <li>
+        Send timestamp of incoming messages to server
+    </li>    
+</ul>
+
+Version 2.0-rc1 (2011/09/28)
 
 <ul>
     <li>
diff --git a/serverapi/index.html b/serverapi/index.html
index 94340e4..1e09c91 100755
--- a/serverapi/index.html
+++ b/serverapi/index.html
@@ -302,6 +302,11 @@ Additional parameters sent in POST requests with <code>action=incoming</code>:
         The message body of the SMS, or the content of the <code>text/plain</code> part of the MMS.
         For multipart SMS messages, this field contains all parts concatenated and may be longer than 160 characters.
     </dd>
+    
+    <dt>"timestamp" ::= &lt;long integer&gt;</dt>
+    <dd>
+        The timestamp of the incoming message, in milliseconds since midnight, January 1, 1970 UTC.
+    </dd>    
 </dl>
         
 Additional parameters sent in POST requests with <code>action=incoming</code> and <code>message_type=mms</code>: