Merge branch 'maint' into java-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 18 Aug 2011 19:34:44 +0000 (21:34 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 18 Aug 2011 19:34:44 +0000 (21:34 +0200)
commit036767871101be12266ca04f9efe1957727744de
treefc41a32e3be625cd7552931ef94a3849223cdaf2
parentf2f162f5efda16ddb660163f838d27969d1e4025
parent91a7653997ca147b3242688f056c89840b789a09
Merge branch 'maint' into java-work
ChangeLog
lib/am/java.am
tests/Makefile.am
tests/Makefile.in
tests/defs.in