Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Fri, 28 Sep 2012 13:28:46 +0000 (15:28 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Mon, 1 Oct 2012 10:12:38 +0000 (12:12 +0200)
commit595284e9d0277517bac8f3fc7bcdd529d97aa6f9
tree33ad06de1c2d86c37471fdf66f6c81c6b6207418
parent46bdb8ec593ea0cfd1604b7d1253a3af1c571e6d
parent93d133c932a4f754172cd8473bfe469975b00023
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  gnulib: update
  errors: indent "user token number redeclaration" context

Conflicts:
src/symtab.c
src/symtab.c
tests/input.at