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

[erinn at torproject.org]

commit c9923c3615cd34beb824847143d2aad6235b1055
Merge: cb24a6e ceea709
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Mar 15 18:08:34 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/Info.plist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)