commit 41056c205ca5628ad746570c6b23bec4f4533fe7 Merge: 9d2b5c6 09ea4a7 Author: Erinn Clark erinn@torproject.org Date: Wed Oct 24 16:34:16 2012 +0100

Merge branch 'maint-2.2' into maint-2.3

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