Merge branch 'branch-1.13.2' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 19 Apr 2013 13:46:36 +0000 (15:46 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 19 Apr 2013 13:46:36 +0000 (15:46 +0200)
commitce98f22ef914ac5f778e63fc750e411b725ccb86
tree894b7dbb3dbed8dc49e917e3c06f0d3e697ac6e5
parentf4a283dc4fed2b1d9fff61c38017aa1a34cd162a
parent82628de32451186708c0630cf995fdf5430c3f76
Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  Add missing '$' for variable expansion in depout.m4
  fixup: one stray reference to older versioning scheme
lib/Automake/Options.pm