[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

[erinn at torproject.org]

commit 0aafb37aa7ba9f597981181793d67696b3668d3b
Merge: 5b02117 5239f44
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 26 10:08:06 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

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