Merge branch 'release-0.10' into release-0.10-debian-squeeze release-0.10-debian-squeeze debian-squeeze-0.10.4-1@bpo60+1 debian-squeeze-1.0.0-1@bpo60+1
authorAndrew Ruthven <andrew@etc.gen.nz>
Mon, 28 Oct 2013 10:19:17 +0000 (23:19 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Mon, 28 Oct 2013 10:19:17 +0000 (23:19 +1300)
commit922b9260517f5b83046e73841d8b752cb5359f33
tree523253a461359658886ec390b4fa4061e5eb0700
parent6518933b92426b948e086c0f80294af37ec3d8a9
parentb6b0b55afc0e2ad7623e8b1bb8cd9a38e06dbdb6
Merge branch 'release-0.10' into release-0.10-debian-squeeze

Conflicts:
debian/changelog
debian/control
Makefile
debian/changelog