commit b53024f0baa2de0260244db02608c2c7bdb89742 Merge: 8ab988a 80c9f3e Author: Erinn Clark erinn@torproject.org Date: Mon Oct 29 22:58:18 2012 +0000

Merge branch 'maint-2.2' into maint-2.3

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