commit ff23c5fdb6c05cb2960fccef3c7f2d6199649098 Merge: cd1c974 07d7c45 Author: Erinn Clark erinn@torproject.org Date: Sat May 11 09:03:10 2013 -0300

Merge branch 'maint-2.4'

build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)