-
Committer:
Karl Fogel
-
Date:
2009-07-17 00:26:05 UTC
-
mfrom:
(8931 launchpad)
-
mto:
This revision was merged to the branch mainline in
revision
8960.
-
Revision ID:
karl.fogel@canonical.com-20090717002605-yp7op67tmwdt2fnr
Merge from bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel,
resolving both tree and text conflicts.