git.saurik.com Git - bison.git/commit

author	Akim Demaille <akim@lrde.epita.fr>
	Tue, 23 Oct 2012 12:03:11 +0000 (14:03 +0200)
committer	Akim Demaille <akim@lrde.epita.fr>
	Tue, 23 Oct 2012 12:03:11 +0000 (14:03 +0200)
commit	df04a68ab54dcd8b899532c51ed0c8e1a0486296
tree	9a974362c33e5995a6fed7b221c2ea4a2a8fc05b	tree \| snapshot
parent	b7226022b07fac385defbf2297892d8c3dc3cd18	commit \| diff
parent	6f1360bd893f202ea621dad1d4993488a7af48bd	commit \| diff

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