fix missed merge conflict
authorBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 08:56:17 +0000 (01:56 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 08:56:17 +0000 (01:56 -0700)
commitcf05119040c45bfd1a0f63fcaae5dcf7a2556639
treecafd765d33e118236a9cd348e3afd7d018302da0
parent192791171c93c2008fa11a9f3bf1a2da2e14ea08
fix missed merge conflict
ChangeLog
configure.ac