commit 98ab7bfc3bc97c1167e7178f7b7eaf311fd57c1a Merge: 1d65c88 8f065c8 Author: Erinn Clark erinn@torproject.org Date: Sun Aug 12 22:20:15 2012 +0100

Merge branch 'maint-2.2' into maint-2.3

build-scripts/recommended-versions | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)