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

[erinn at torproject.org]

commit a1b4049ea5858d923b6ee8f6c23f532f01e3b45d
Merge: e2fac8a 0aafb37
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 26 10:08:12 2012 +0100

    Merge branch 'maint-2.3'

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