[tor-commits] [arm/master] Another hotfix from Fabian (for decimal seconds in the uptime field of ps results)

[sebastian at torproject.org]

commit bb7c907e840b6e4ef6f9af671a763b4bc79df0ec
Merge: 4794d92 623d26f
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jan 13 03:11:36 2011 +0000

    Another hotfix from Fabian (for decimal seconds in the uptime field of ps results)
    
    
    
    svn:r24075

 src/util/uiTools.py |    6 ++----
 src/version.py      |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --cc src/version.py
index ddd3748,f6e1269..cf86296
--- a/src/version.py
+++ b/src/version.py
@@@ -2,6 -2,6 +2,6 @@@
  Provides arm's version and release date.
  """
  
- VERSION = '1.4.1.1'
- LAST_MODIFIED = "January 11, 2011"
 -VERSION = '1.4.1_dev'
 -LAST_MODIFIED = "January 7, 2011"
++VERSION = '1.4.1.2'
++LAST_MODIFIED = "January 12, 2011"