From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 6 Apr 2012 04:50:34 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b361bcea83140c28b5a5677905405de0ac102791;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php

* master:
---