From: Simon L'nu Date: Mon, 28 May 2012 20:49:12 +0000 (-0400) Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=91c1a2943badc32b521acd5cc933a236ca6f5c0f;p=friendica.git Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: slackr - tone down the shadows a smidgin add plugin hooks to gender, sexpref, and marital selectors birthday in november,december bug rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. handle multiple underscores in D* links * master: --- 91c1a2943badc32b521acd5cc933a236ca6f5c0f