Merge branch 'maint'
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 16 Oct 2012 13:26:55 +0000 (15:26 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 16 Oct 2012 13:26:55 +0000 (15:26 +0200)
commit8ea6525e3a092b76256fbed7d6edbb0a1861aee1
treeb116d2f559746be12133f296d2613009cab5285e
parentf3bc338643cf15f345fa3a63811bd92869a42b89
parent7287be84f10886ea3c38ac86da1d6642822b671e
Merge branch 'maint'

* origin/maint:
  java: use api.location.type and api.position.type

Conflicts:
NEWS
data/java.m4
doc/bison.texi
tests/java.at
NEWS
data/java.m4
doc/bison.texi
tests/java.at