commit 1f74fb9dc8d986956d154dcaae2efcdee9a769c3 Merge: 77b5803 6026825 Author: Erinn Clark erinn@torproject.org Date: Mon Jul 30 00:50:35 2012 +0100

Merge branch 'maint-2.2' into maint-2.3

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