24 Apr
2011
24 Apr
'11
5:55 a.m.
commit 8b4d9f13e50f6a420b1000c70de25bf244db393a Merge: 6534807 8b8568e Author: Damian Johnson atagar@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(-)