Merge remote-tracking branch 'origin/moonshot' into debian
authorSam Hartman <hartmans@debian.org>
Wed, 25 Jan 2012 16:52:45 +0000 (11:52 -0500)
committerSam Hartman <hartmans@debian.org>
Wed, 25 Jan 2012 16:52:45 +0000 (11:52 -0500)
commit5f617fbf7f4c5dcb39fa5f8216d6c2ae225183b2
treec8a8d0e8bb4efbe170f1ad59363cb7f857e61db0
parent834980e3fdfa0dd31e3115d3e522edb3dda6ffc4
parenta033790fcc14f1c66fc2bd113d863e91a063f118
Merge remote-tracking branch 'origin/moonshot' into debian
lib/Makefile.am