Merge branch 'bzr/lp' master
authorAndrew Ruthven <puck@catalyst.net.nz>
Thu, 5 Mar 2009 19:44:53 +0000 (08:44 +1300)
committerAndrew Ruthven <puck@dirk.wgtn.cat-it.co.nz>
Thu, 5 Mar 2009 19:44:53 +0000 (08:44 +1300)
commita233afe112982d97cdad1519ae4b5d736d3dbba3
tree3621e7e83f8b0ffba218ce8eec82c83fb28ba950
parentbc6305f3694e462a77cc201b033de0fba2131b22
parentbee745a10fcae69457b191f4cf99f6db4f1caff2
Merge branch 'bzr/lp'

Conflicts:
debian/changelog
debian/update-motd.cron.d
debian/changelog
debian/control
debian/update-motd.cron.d