Merge branch 'v1.1.0' into debian debian/1.1.0-1
authorBdale Garbee <bdale@gag.com>
Wed, 4 Aug 2010 12:26:45 +0000 (08:26 -0400)
committerBdale Garbee <bdale@gag.com>
Wed, 4 Aug 2010 12:26:45 +0000 (08:26 -0400)
commit1e6db16868e084daf20e0b14574dd11fe9f259ed
tree04b7d3c162681729571f036d24ace69c10631799
parent61d94daba647622581bdf11d29fd701190da03c4
parent554b65b3960eeb227441d631790d75446534c2a4
Merge branch 'v1.1.0' into debian

Conflicts:
debian/changelog
debian/changelog
debian/control