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

[sebastian at torproject.org]

commit c038e2c7170e3725ca0b83f08744d94947ee1718
Merge: b7492fc 4c3d7ca
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri May 25 14:20:28 2012 +0200

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/recommended-versions |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)