[tor-commits] [torbrowser/maint-2.2] Merge branches 'firefox-6.0.1' and 'maint-2.2' into maint-2.2

4 Sep 2011


      commit a9695967ea91ee70f3b20ffe2f19c6442187d3c6
Author: Erinn Clark <erinn@torproject.org>
Date:   Sun Sep 4 22:06:25 2011 +0100

    Merge branches 'firefox-6.0.1' and 'maint-2.2' into maint-2.2

[tor-commits] [torbrowser/maint-2.2] Merge branches 'firefox-6.0.1' and 'maint-2.2' into maint-2.2

erinn＠torproject.org