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

commit 83fa4cc44516429abfe8bda23201a9fb3c7e0e2d Merge: a91b9e0 1096251 Author: Erinn Clark erinn@torproject.org Date: Thu Apr 26 23:03:14 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

.../0015-Add-DDG-and-StartPage-to-Omnibox.patch | 84 +++ .../0015-Undo-some-Mozilla-braindamage.patch | 28 - ...ven-Michaud-s-Mac-crashfix-patch-for-FF12.patch | 544 ++++++++++++++++++++ .../0016-Add-DDG-and-StartPage-to-Omnibox.patch | 84 --- 4 files changed, 628 insertions(+), 112 deletions(-)