From: Roland Haeder Date: Sat, 31 Jan 2015 15:38:44 +0000 (+0100) Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0b4115b2496c830fb0a4373bcc9a27050899db55;p=quix0rs-gnu-social.git Merge branch 'nightly' of gitorious.org:social/mainline into nightly Signed-off-by: Roland Haeder Conflicts: actions/apistatusesshow.php actions/apitimelinepublic.php actions/logout.php actions/public.php --- 0b4115b2496c830fb0a4373bcc9a27050899db55