commit 216bce956b6eca53d7c2a764c6b37598641eeedd Merge: c2db02c 638d793 Author: Erinn Clark <erinn at torproject.org> Date: Fri Apr 26 13:48:21 2013 -0300 Merge branch 'maint-2.4' build-scripts/config/Info.plist | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)