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

commit ceea7095fe28558b3bc205a8fa060a758378d569 Merge: 8dae835 aaa5c5d Author: Erinn Clark <erinn@torproject.org> Date: Thu Mar 15 18:08:27 2012 -0300 Merge branch 'bug4356' into maint-2.2 build-scripts/config/Info.plist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)