commit 872c450fcf862f803ca36f624226246d5d8b87a1 Merge: aec6689 aff2631 Author: Erinn Clark erinn@torproject.org Date: Thu Nov 10 02:58:56 2011 +0000

Merge branch 'clean-versions' into maint-2.2

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