Trivial merge.
authorNiels Möller <nisse@lysator.liu.se>
Thu, 29 Mar 2012 20:04:43 +0000 (22:04 +0200)
committerNiels Möller <nisse@lysator.liu.se>
Thu, 29 Mar 2012 20:04:43 +0000 (22:04 +0200)
commit83fc50a8a0d0a1dd778ee331a9a320fab02f452b
tree20da7da3b0e68196cf9737afc02f8f34f183b383
parentbb6d1283543a97242daaa75ba4cd65b3f64f5119
parentc4d3a98dd30160bd91dd5409cf2ada24019f8c3d
Trivial merge.
ChangeLog
configure.ac