[tor-commits] [torbrowser/master] Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2

23 Oct 2011


      commit 47c49cd1a98edf4dee0cfb72a2183c02cd43ca82
Author: Erinn Clark <erinn@torproject.org>
Date:   Sat Aug 20 16:14:28 2011 +0200

    Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2

[tor-commits] [torbrowser/master] Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2

erinn＠torproject.org