[tor-commits] [arm/master] Merge release commit '8b8568e'

[sebastian at torproject.org]

commit 8b4d9f13e50f6a420b1000c70de25bf244db393a
Merge: 6534807 8b8568e
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Apr 21 09:42:15 2011 -0700

    Merge release commit '8b8568e'
    
    Conflicts:
    	src/version.py

 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)