commit 81cce30fcde60c7e8f591f57b82f06c4aec16dab Merge: ee24c18 0f7e062 Author: Mike Perry mikeperry-git@fscked.org Date: Thu Jul 25 16:58:15 2013 +0200

Merge branch 'maint-2.4'

build-scripts/config/extension-overrides.js | 8 +++++--- build-scripts/config/pound_tor.js | 10 ++++------ 2 files changed, 9 insertions(+), 9 deletions(-)