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

[erinn at torproject.org]

commit 81a071ecaa61be0c3cebdbe0e3187a8e93e87891
Merge: 1542586 5ad53f6
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Sep 7 12:58:56 2012 +0100

    Merge branch 'master' into maint-2.3

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