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)
commit9155673850189951e27e188f2003ba68d8ea2c67
treea7b4055b721fa7291e43a42c1bbf589eed971ac1
parent36da2074d28309d1704b47e121f432fcdaf8a245
parent8097dc0ba0178a6652959fc3d3ffbc8ebb319935
Merge remote-tracking branch 'refs/remotes/origin/master'

 especially if it merges an updated upstream into a topic branch.