From: Akim Demaille <akim@lrde.epita.fr>
Date: Tue, 23 Oct 2012 12:03:11 +0000 (+0200)
Subject: Merge branch 'branch-2.6' into maint
X-Git-Tag: v2.6.90~53
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/df04a68ab54dcd8b899532c51ed0c8e1a0486296?ds=sidebyside;hp=df04a68ab54dcd8b899532c51ed0c8e1a0486296

Merge branch 'branch-2.6' into maint

* origin/branch-2.6:
  maint: post-release administrivia
  version 2.6.4
  regen
  2.6.4: botched 2.6.3
---