Merge remote-tracking branch 'refs/remotes/origin/master'
authorMichael Wallner <mike@php.net>
Thu, 5 Dec 2013 08:37:03 +0000 (09:37 +0100)
committerMichael Wallner <mike@php.net>
Thu, 5 Dec 2013 08:37:03 +0000 (09:37 +0100)
 especially if it merges an updated upstream into a topic branch.


Trivial merge