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

[erinn at torproject.org]

commit ca4d7bcf8e5060a223b0a2229abce27afbb79a06
Merge: 248881b af0a838
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Jun 7 18:01:02 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 changelog.linux-2.2   |    1 +
 changelog.osx-2.2     |    1 +
 changelog.windows-2.2 |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)