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

[erinn at torproject.org]

commit 61331274907121e75825decaf9a8d63fed86edda
Merge: da1ec9f f26274d
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Nov 17 16:47:30 2013 -0200

    Merge branch 'maint-2.4'

 README.LINUX-2.4                |    3 +--
 README.OSX-2.4                  |    3 +--
 README.WIN-2.4                  |    3 +--
 build-scripts/config/Info.plist |    6 +++---
 build-scripts/versions-alpha.mk |    4 ++--
 changelog.linux-2.4             |    5 +++--
 changelog.osx-2.4               |    5 +++--
 changelog.windows-2.4           |    5 +++--
 8 files changed, 17 insertions(+), 17 deletions(-)