-
Committer:
Karl Fogel
-
Date:
2009-07-17 18:46:25 UTC
-
mfrom:
(8950 launchpad)
-
mto:
This revision was merged to the branch mainline in
revision
8960.
-
Revision ID:
karl.fogel@canonical.com-20090717184625-owp2f6nxujb6w01z
Merge from bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel,
resolving four text conflicts.