From b361bcea83140c28b5a5677905405de0ac102791 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 6 Apr 2012 00:50:34 -0400
Subject: [PATCH] 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: