From: Michael Wallner <mike@php.net>
Date: Tue, 17 Sep 2013 09:10:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Tag: php-5.6.0alpha1~211^2~11^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=512734b58dc4e231971901cb87656d67c87e7645;p=php

Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master:
  Exclude bison 3.0 by Mike
---

512734b58dc4e231971901cb87656d67c87e7645