]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 6 Apr 2012 04:50:34 +0000 (00:50 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 6 Apr 2012 04:50:34 +0000 (00:50 -0400)
commitb361bcea83140c28b5a5677905405de0ac102791
tree5097892590d1c47371421ab44b867f00081278bc
parent9b6e91086b29554fd04362f6c87ea148718e8b1c
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: