fix gnulib-tool botched merge
authorIan Beckwith <ianb@erislabs.net>
Mon, 3 Feb 2014 01:03:03 +0000 (01:03 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 3 Feb 2014 01:03:03 +0000 (01:03 +0000)
commit0f81b07e4fce25a25eb94c363f0624d7b2b99bca
tree58c934d255f77224b0cfbe0775a942060c46066d
parente1c466d11a91615c413789ea8bc3ec358f2c6aa9
fix gnulib-tool botched merge
gnulib-tool