[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

commit 244fba90a89aa2794c37b9e702168622b61c24f9 Merge: 7a618ec 0857988 Author: Erinn Clark <erinn@torproject.org> Date: Fri Jun 21 19:30:44 2013 -0300 Merge branch 'maint-2.4' build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)