commit 127a3cd2bdf9131048238d0c5526fdf74b2b8ffa Merge: fe48788 07dc532 Author: Erinn Clark erinn@torproject.org Date: Wed Jun 6 18:31:35 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

build-scripts/versions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)