Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes

Conflicts:
	plugins/Minify/extlib/minify/README.txt
	plugins/Minify/extlib/minify/UPGRADING.txt
	plugins/Minify/extlib/minify/min/README.txt
	plugins/Minify/extlib/minify/min/builder/index.php
	plugins/Minify/extlib/minify/min/lib/JSMin.php
	plugins/Minify/extlib/minify/min/lib/Minify.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php
	plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php
	plugins/Minify/extlib/minify/min/lib/Minify/Packer.php
	plugins/Recaptcha/RecaptchaPlugin.php

diff --cc CONFIGURE
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc plugins/BitlyUrl/BitlyUrlPlugin.php
Simple merge

diff --cc plugins/Mapstraction/MapstractionPlugin.php
Simple merge

diff --cc plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
Simple merge

diff --cc plugins/Sitemap/SitemapPlugin.php
Simple merge