~launchpad-pqm/launchpad/devel

Merge from Rocketfuel
Patches applied:

 * andrew.bennetts@canonical.com/launchpad--TacTestSetup-robustness--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2332

 * andrew.bennetts@canonical.com/launchpad--TacTestSetup-robustness--0--patch-1
   Make sure that TacTestSetup fails if the daemon did not start successfully.

 * andrew.bennetts@canonical.com/launchpad--TacTestSetup-robustness--0--patch-2
   Minor tweaks in response to review comments.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2294

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-1
   Failing tests for bug #1585.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-2
   *Correct* tests -- use emailaddress sample data that has VALIDATED/PREFERRED statuses, rather than NEW.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-3
   Make test_preferredEmailFirst pass.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-4
   Add tests for and fix logging in with an unconfirmed email address.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-5
   Convert authserver's database.py to use sqlvalues, and make sqlvalues convert unicode objects to utf-8 strings.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-6
   Convert authserver's database.py to use sqlvalues, and make sqlvalues convert unicode objects to utf-8 strings.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-7
   Revert sqlbase utf-8 change, explicitly utf-8 encode in authserver instead, and also remove some trailing whitespace and minor reformatting for consistency.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-8
   Formatting tweaks to satisfy review.

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-9
   Call base class's __init__ in UserDetailsResource

 * andrew.bennetts@canonical.com/launchpad--bug-1585--0--patch-10
   Revert bad change in sqlbase.py.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1764

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-1
   Remove now-unused AliasSearchResource

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-2
   Move initZopeless import into if __name__ == '__main__' block.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-3
   Remove unused import

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-4
   Simplify sqlbase.{begin,commit,rollback}

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-5
   Create a FakeZopelessTransactionManager to fix Librarian unit test issues.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-6
   Better XXX comment, some style improvements.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-7
   Merge from rocketfuel

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-8
   Another test case.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-9
   Merge from rocketfuel.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-10
   Fix copyright and __metaclass__ module boilerplate omissions in the librarian.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-11
   Own my XXX comments.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-12
   Merge from rocketfuel.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-13
   Remove obsolete XXX.

 * andrew.bennetts@canonical.com/launchpad--librarian-cleanups--0--patch-14
   Merge from rocketfuel, resolving a trivial conflict.

 * andrew.bennetts@canonical.com/launchpad--librarian-upstream--0--base-0
   tag of stuart.bishop@canonical.com/launchpad--librarian--1--patch-3

 * andrew.bennetts@canonical.com/launchpad--librarian-upstream--0--patch-1
   First cut at implementing upstream librarian support

 * andrew.bennetts@canonical.com/launchpad--librarian-upstream--0--patch-2
   Correctly access config.librarian.server.upstream_url.

 * andrew.bennetts@canonical.com/launchpad--librarian-upstream--0--patch-3
   Import ReverseProxyResource.

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2283

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-1
   add some sampledata

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-2
   add distrorelease cve report

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-3
   make the cve listing a macro.

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-4
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-5
   add test

 * bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-6
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--smallfixes--0--patch-2
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--smallfixes--0--patch-3
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--smallfixes--0--patch-4
   import BugSetBase from the correct place.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2104

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-1
   +messages/+new -> +newcomment

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-2
   replay basic-bug-attachments--0--patch-12

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-3
   remove unneeded method.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-4
   make threading work when adding a comment via the web ui.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-5
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-6
   improve documentation.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-7
   improve documentation.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-8
   make IBug.linkMessage return the IBugMessage

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-9
   make threading work if the comment is a direct reply to another comment.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-10
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-11
   replay bjorn.tillenius@canonical.com/launchpad--basic-bug-attachments--0--patch-39

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-12
   add parent to IMessageSet.fromText

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-13
   IMessageSet.fromText: title -> subject

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-14
   make threading work for comments added by email.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-15
   whitespace

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-16
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-17
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-18
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-19
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-20
   revert accidental commit

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-21
   some tweaks in BugMessageAddView

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-22
   set the parent of the message to the next available parent in the database.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-23
   add test

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-24
   fix test.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-25
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-26
   tweaks

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-27
   add an assert

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-28
   add initial_message to IBug

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-29
   if the initial comment isn't in References, add it.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-30
   use getUtility where possible in bugactivity.txt. fix test failures.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-31
   bugID -> bug

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-33
   refactor common functionality in mailnotification.py into one function. add test for notifications of marking a bug a duplicate.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-34
   make threading work for edit and add notifications as well.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-35
   cleanup

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-36
   make sure createMessage sets the parent

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-37
   make it possible to specify a fallback parent to IMessageSet.fromEmail

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-38
   merge MaloneCommandInterface

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-39
   make bugattachments.txt pass

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-40
   make sure the parent gets sent when creating bug comments from email.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-41
   add sampledata to ensure that every bug has at least one comment.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-42
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-43
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-44
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-45
   fix some of the faulty conflict resolution.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-46
   merge rf, resolve conflicts

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-47
   changes as per review.

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-48
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--threadable-notifications--0--patch-49
   merge rf, resolve conflicts.

 * brad.bollenbach@canonical.com/launchpad--FormattingBugNotifications--0--patch-28
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--FormattingBugNotifications--0--patch-29
   implement the From address bit of FormattingBugNotifications

 * brad.bollenbach@canonical.com/launchpad--bugtask-listing-actions-cleanup--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2065

 * brad.bollenbach@canonical.com/launchpad--bugtask-listing-actions-cleanup--0--patch-1
   de-underline bug stats links

 * brad.bollenbach@canonical.com/launchpad--bugtask-listing-actions-cleanup--0--patch-2
   small test fixes

 * brad.bollenbach@canonical.com/launchpad--humanization--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2415

 * brad.bollenbach@canonical.com/launchpad--humanization--0--patch-1
   hide dups from the assigned bugs report; improve the wording and pagetest

 * brad.bollenbach@canonical.com/launchpad--humanization--0--patch-2
   test fix

 * brad.bollenbach@canonical.com/launchpad--malone-bug-1378--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2426

 * brad.bollenbach@canonical.com/launchpad--malone-bug-1378--0--patch-1
   fix bug #1378; remove some more db imports where they don't belong

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-664
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-665
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-666
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-667
   Reapplied daf's patch to use twisted 2.0 with launchpad (Closes: #1385)

 * celso.providelo@canonical.com/launchpad--buildd--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1744

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-1
   Merge from RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-2
   Merge from RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-3
   Auto build separation initial changes.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-4
   Auto build repaired, still having problems with arch-independent packages.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-5
   Remove unused StringIO cast for urlopen.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-6
   Return logtail as binary and ensure amount is int.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-7
   Repaired typo on slave module and noisely debug.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-8
   Properly parsing udeb changes file and correct length to librarian

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-9
   Merge from RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-10
   Slavescan is able to dispatch job alone in a more reasonable way.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-11
   Master installing lockfile to prevent mess when running as cron job.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-12
   using daemons/slave-scan-daemon instead of cron-like scripts/slavescan

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-13
   Set slave-scanner-daemon to log into a file.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-14
   robustness improves when scanning build jobs.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-15
   Handling Librarian errors

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-16
   Merge from RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-17
   typo on slave code

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-18
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-19
   improve startup algorithm

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-20
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-21
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-22
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-23
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-24
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-25
   bug solved, missed 'exec'

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-26
   Applying spiv review, moving files properly

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-27
   Merge from RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-28
   Applying spiv's review (old and current), still missing test section.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-29
   Some preliminar tests for buildd stuff

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-30
   redesigned 'annotation' stuff

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-31
   Review on Buildd, partially applied. tests failing.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-32
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-33
   Merge from RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-34
   finish review, tests failing.

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-35
   Merge From RF

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-36
   applying jamesh's review 

 * celso.providelo@canonical.com/launchpad--buildd--0--patch-37
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--base-0
   tag of celso.providelo@canonical.com/launchpad--devel--0--patch-600

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-1
   Merge from Buildd

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-2
   Land Pages for BuildFarm

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-3
   Show some data if it exists

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-4
   Sampledata for buildUI

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-5
   Merge From RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-6
   More skeleton pages

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-7
   Missed files from previous commit

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-8
   New forms to add/edit builders and some portlets

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-9
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-10
   Correct vocabulary for Builder Owner

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-11
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-12
   Missed imports and __all__ declarations.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-13
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-14
   2.4 style fixes.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-15
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-16
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-17
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-18
   Last minute changes to get the stuff working, still ugly.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-19
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-20
   Following ABUI spec.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-21
   Add facets to soyuz UI and empty pages for builds.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-22
   Builder page including last builds (incomplete).

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-23
   Missed file

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-24
   right layout for builder page and rearranged properties

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-25
   Improving layout and add functionalities.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-26
   Presenting buildduration, stub Abort/Stop pages and other UI changes.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-27
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-28
   typo on imports

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-29
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-30
   Missed typo on db conf

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-31
   Merge from RF, 4 conflicts resolved

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-32
   pagetitle for abort and right commented line, perfume

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-33
   Merge from MPT

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-34
   Sort out bad conflict resolution and missapplied formatters, still destroyed in matter of UI, needs loves

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-35
   Merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-36
   Merge from MPT

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-37
   Reverting misapplied changes in configuration files in mpt's branch

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-38
   Even more missed missapplied bits

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-39
   add addtional condition to present logtail and correct button caption.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-40
   Merge from RF, 2 conflicts solved on dbobjects/builddmaster import lines

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-41
   Fixed code typos and database default values

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-42
   Add tests according BasicTestCoverage spec for Builder/BuilderSet Classes.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-43
   merge from RF, 7 conflicts resolved, 1 pagetest fix due changes in sampledata.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-44
   removing duplicated code inserted by baz

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-45
   land preliminar pagetests and needed sampledata

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-46
   Applying review comments and removing misterious files

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-47
   merge from RF, 2 conflicts resolved

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-48
   Add pagetest for empties +builds pages, certifying all pages are working.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-49
   Merge from RF, 1 conflict resolved

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-50
   CanonicalURL for Build, and template fields fill up

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-51
   Fixing pagetest due UI changes

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-52
   Preliminary changes for distrorelease/+builds

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-53
   Minor fix for Distrorelease/+builds contents.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-54
   Minor fixes on docstrings and tests

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-55
   merge from RF

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-56
   fix facets and applying review comments

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-57
   Review builder related facets, gave up current implementation until context_menus implementation lands.

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-58
   Merge from RF, 2 conflicts solved

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-59
   including lp-wise changes in RootObject for new stuff

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-60
   merge from RF, finally no conflicts ;)

 * celso.providelo@canonical.com/launchpad--builddUI--0--patch-61
   Merge from RF

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-34
   UI improves for CoC

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-35
   Lot of improves for GPG Handling, cover mpt UI suggestion, adding encript support, better workflow at all.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-36
   UI review from mpt

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-37
   Sending encrypted token for ValidateGPG, pagetest broken, can't use current GpgHandler instance.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-38
   Merge from RF, tests still broken in the same place.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-39
   Sending Encrypted Email for GPG validation and minor UI redesign.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-40
   Missed comma on import

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-41
   Merge from RF

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-42
   Bad resolved conflict, now is sane

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-43
   Add pagetests for New GPG/CoC stuff

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-44
   Improving error messages for Sign CoC.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-45
   jamesh review applied, added datecreated suport for current CoC release.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-46
   Sanitise remove_gpgtoken to not show duplicated entries, add some pagetitles, reapair some templates and pagetests

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-47
   Current CoC datereleased as attribute of conf, GPG.revoked renamed to active, adding guessed emails as NEW, treat emails already registed in another accounts and executing gpg tests as sample person (name12).

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-48
   Minor UI improves.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-49
   Changes recommended by stub.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-50
   Merge From RF testing failing due wrong pyme usage.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-51
   repair pyme import, now tests pass.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-52
   Merge from RF

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-53
   Merge from RF

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-54
   typo on logintoken, modified 0xDFD20543 to test new email and not importing revoked uid.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-55
   solving titleheader issue for coc pages and portlet presenting login sensitive information.

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-56
   removing missapplied pagetests

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-77
   Fix for sqlobject warning on test

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-78
   missed fix on test indentation

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-79
   Merge from RF

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-80
   Add order bits for GPGKeySet.getGPGKeys, we can slice w/o warnings

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-81
   Fix for bug # 2374 (missed </code> in message) and bug # 2376 (removed unused template content).

 * celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-82
   merge from RF

 * christian.reis@canonical.com--lozenge/launchpad--trivialities--0--patch-26
   Merge from RF

 * christian.reis@canonical.com--lozenge/launchpad--trivialities--0--patch-27
   Fix for bug 2296: Broken LInk (system error); the problem was that browser.pofile.POFileView.getPluralFormExpression was fragile. I moved the code to POHeader(), added tests and added an XXX to ensure we keep track of bugs

 * christian.reis@canonical.com--lozenge/launchpad--trivialities--0--patch-28
   Delintify

 * christian.reis@canonical.com--lozenge/launchpad--trivialities--0--patch-29
   Merge from the rocket

 * daf@canonical.com--2004/launchpad--devel--0--patch-486
   fix Rosetta prefs page and add page test

 * daf@canonical.com--2004/launchpad--devel--0--patch-487
   suggestions from Steve about the interface additions

 * daf@canonical.com--2004/launchpad--import-fascism--0--patch-23
   merge tests brach from Morgan

 * daf@canonical.com--2004/launchpad--import-fascism--0--patch-24
   clean up browser code

 * daf@canonical.com--2004/launchpad--import-fascism--0--patch-25
   suggestions from Steve, test fixes

 * daniel.debonzi@canonical.com/launchpad--devel--1--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2008

 * daniel.debonzi@canonical.com/launchpad--devel--1--patch-1
   Work on add distribution requested by kiko.

 * daniel.debonzi@canonical.com/launchpad--devel--1--patch-2
   merge from rocketfuel

 * daniel.debonzi@canonical.com/launchpad--devel--1--patch-3
   database object little fixes

 * daniel.debonzi@canonical.com/launchpad--devel--1--patch-4
   missing requested comment added

 * daniel.debonzi@canonical.com/launchpad--devel--1--patch-5
   merge from rocketfuel

 * daniel.silverstone@canonical.com--desktop/launchpad--buildd-package--0--base-0
   tag of daniel.silverstone@canonical.com--laptop/launchpad--buildd-package--0--patch-1

 * daniel.silverstone@canonical.com--desktop/launchpad--buildd-package--0--patch-1
   More PHONY targets

 * daniel.silverstone@canonical.com--desktop/launchpad--buildd-package--0--patch-2
   PEP8, my ancient nemesis

 * daniel.silverstone@canonical.com--desktop/launchpad--publishing--2--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2395

 * daniel.silverstone@canonical.com--desktop/launchpad--publishing--2--patch-1
   Make the publisher aware of debian-installer and fix up some non-PEP8ish code. Thanks lifeless.

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd-chroot-builder--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2381

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd-chroot-builder--0--patch-1
   star-merge from rocketfuel@canonical.com/launchpad--devel--0

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd-chroot-builder--0--patch-2
   The chroot tool for launchpad-buildd

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd-chroot-builder--0--patch-3
   Apply review from spiv. Update launchpad-buildd to v6 as a result

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd-package--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1837

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd-package--0--patch-1
   Launchpad buildd package

 * daniel.silverstone@canonical.com--laptop/launchpad--distrorelease-finder--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2413

 * daniel.silverstone@canonical.com--laptop/launchpad--distrorelease-finder--0--patch-1
   add getDistroReleaseAndPocket for keybuk

 * daniel.silverstone@canonical.com--laptop/launchpad--distrorelease-finder--0--patch-2
   Review response for mark, turn the logic upside down and search by suffix rather than by dash separated sections

 * daniel.silverstone@canonical.com--laptop/launchpad--distrorelease-finder--0--patch-3
   More readable reverse length sort

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-81
   enable all tests in canonical.arch.tests.test_database

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-82
   remove test suite goo made redundant by OrderedTestLoader

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-83
   remove unused buttress findByName methods

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-84
   one test case for VersionMapper.findByName

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-85
   merge rocketfuel

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-86
   merge rocketfuel

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-87
   remove VersionMapper.findByName support for missing version (buggy dead code)

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-88
   merge rocketfuel (includes merge with importd branch)

 * david.allouche@canonical.com--2004/launchpad--devel--0--patch-89
   post-review fixes

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-6
   merge from rf

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-7
   Lots of small fixes suggested by people who tried shipit since it reached staging.

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-8
   small fixes kiko suggested

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-9
   lots of small UI tweaks and improved the pagetest to cover more cases.

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-10
   dammit; kiko changed a message in the template. had to change it in the page test.

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-11
   merge from rf

 * guilherme.salgado@canonical.com/launchpad--shipitng--1--patch-12
   bah! more strings to fix in pagetests.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--4--patch-18
   Add KarmaActionName to dbschema.__all__ and add a distinct to IKarmaActionSet.selectByCategoryAndPerson() (fix https://launchpad.ubuntu.com/malone/bugs/1260).

 * guilherme.salgado@canonical.com/launchpad--smallfixes--4--patch-19
   Fix Person.karma and add sampledata so it's tested.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--4--patch-20
   merge from rf

 * guilherme.salgado@canonical.com/launchpad--smallfixes--4--patch-21
   Comments for IPerson.addLanguage() and IPerson.removeLanguage()

 * guilherme.salgado@canonical.com/launchpad--smallfixes--6--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2073

 * guilherme.salgado@canonical.com/launchpad--smallfixes--6--patch-1
   Fix PersonSet's methods to always return results ordered by Person._defaultOrder if no orderBy argument is provided.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--6--patch-2
   Apply SteveA's requests and update the docstring of methods I changed.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--6--patch-3
   Fix BugTaskSet.search() and add code that uses the fixed part to make sure it's tested.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--11--patch-5
   Merge team membership records when merging people.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--11--patch-6
   Handle the case when both from_person and to_person are active members of a team, when performing a merge.

 * james.henstridge@canonical.com--2004/launchpad--smallfixes--0--patch-3
   add facets to IPerson and IProject, add calendar facet

 * james.henstridge@canonical.com--2004/launchpad--smallfixes--0--patch-4
   use fmt:url for product URLs in portlet so links work in other contexts

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--base-0
   tag of bjorn.tillenius@canonical.com/launchpad--DistroReleaseCVEReport--0--patch-6

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-1
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-2
   merge rocketfuel, resolving conflicts

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-3
   add cve entry patch, interface and db

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-4
   start linking bugs and cve entries

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-5
   cve update script tested

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-6
   check point for rf merge

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-7
   merge rocketfuel, resolving conflicts

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-8
   major hackergotchi and cve work, with a new form system too

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-9
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-10
   get cve distro reports, and debbugs sync in place

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-11
   merge rocketfuel and add debbugs sampledata

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-12
   start work on mkdebwatches testing

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-13
   bring sampledata up to snuff

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-14
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-15
   test fixes

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-16
   test fixes

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-17
   test fixes

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-18
   continued work on bug and cve linking

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-19
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-20
   tests for cve update script

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-21
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-22
   further rearrangement of debbugs import

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-23
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-24
   changes for [r=jamesh]

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-25
   test fix

 * mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-26
   test fix

 * mark.shuttleworth@canonical.com/launchpad--cverework--1--base-0
   tag of mark.shuttleworth@canonical.com/launchpad--cverework--0--patch-26

 * mark.shuttleworth@canonical.com/launchpad--cverework--1--patch-1
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--cverework--1--patch-2
   check that images are images

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2407

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-1
   make space for development manifests

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-2
   add security details for development manifests

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-3
   add sprint pages

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-4
   page template tweaks

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-5
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-6
   add tests for sprint system, and link to sprints from the spec tracker

 * mark.shuttleworth@canonical.com/launchpad--developmentmanifests--0--patch-7
   merge person now handles sprintattendance

 * morgan.collett@canonical.com/launchpad--bug-1285--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2047

 * morgan.collett@canonical.com/launchpad--bug-1285--0--patch-1
   Fix bugs 1284 and 1285 - add links to releases

 * morgan.collett@canonical.com/launchpad--bug-1285--0--patch-2
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--bug-1289--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2055

 * morgan.collett@canonical.com/launchpad--bug-1289--0--patch-1
   Remove class=documentContent to make text less bold

 * morgan.collett@canonical.com/launchpad--bug-130--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2053

 * morgan.collett@canonical.com/launchpad--bug-130--0--patch-1
   Use fmt:text-to-html to format multiparagraph descriptions

 * morgan.collett@canonical.com/launchpad--bug-1391--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2079

 * morgan.collett@canonical.com/launchpad--bug-1391--0--patch-1
   Fix bug 1391 - add missing elements

 * morgan.collett@canonical.com/launchpad--bug-1391--0--patch-2
   Fix it better

 * morgan.collett@canonical.com/launchpad--project-tests--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2046

 * morgan.collett@canonical.com/launchpad--project-tests--0--patch-1
   Add a pagetest for project adding a bugtracker

 * morgan.collett@canonical.com/launchpad--trivial--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1976

 * morgan.collett@canonical.com/launchpad--trivial--0--patch-1
   Remove DOAP from pagetitles

 * morgan.collett@canonical.com/launchpad--trivial--0--patch-2
   Bug 1248: fix problems in RDF output

 * morgan.collett@canonical.com/launchpad--trivial--0--patch-3
   merge rocketfuel

 * mpt@canonical.com/launchpad--DisplayingParagraphsOfText--0--base-0
   tag of steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-3

 * mpt@canonical.com/launchpad--DisplayingParagraphsOfText--0--patch-1
   Add some failing tests

 * mpt@canonical.com/launchpad--bug-contexts-table--0509--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-168

 * mpt@canonical.com/launchpad--bug-contexts-table--0509--patch-1
   tidy up bug contexts table, using priority icons and making the contexts linkable

 * mpt@canonical.com/launchpad--bug-contexts-table--0509--patch-2
   tweak 'Assigned to' column and request-fix links

 * mpt@canonical.com/launchpad--bug-contexts-table--0509--patch-3
   fix pagetest

 * mpt@canonical.com/launchpad--bug-contexts-table--0509--patch-4
   restore colors for Status column, and remove colored icons

 * mpt@canonical.com/launchpad--buildfarm--0508--base-0
   tag of celso.providelo@canonical.com/launchpad--builddUI--0--patch-30

 * mpt@canonical.com/launchpad--buildfarm--0508--patch-1
   initial cleanup

 * mpt@canonical.com/launchpad--buildfarm--0508--patch-2
   hack builder page, begin package icons

 * mpt@canonical.com/launchpad--buildfarm--0508--patch-3
   add more icons, remove stray portlet

 * mpt@canonical.com/launchpad--buildfarm--0508--patch-4
   merge rocketfuel

 * mpt@canonical.com/launchpad--buildfarm--0508--patch-5
   merge Celso, resolving conflicts

 * mpt@canonical.com/launchpad--buildfarm--0508--patch-6
   fix build machine table; add progress icon; remove silly product icon

 * mpt@canonical.com/launchpad--calendar-cleanup--0--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-85

 * mpt@canonical.com/launchpad--calendar-cleanup--0--patch-1
   calendar template cleanup

 * mpt@canonical.com/launchpad--calendar-cleanup--0--patch-2
   merge rocketfuel

 * mpt@canonical.com/launchpad--calendar-cleanup--0--patch-3
   fix pagetest

 * mpt@canonical.com/launchpad--deactionizing--0508--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-139

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-1
   remove useless 'actions:' header from context menu, simplifying menu item text as a result; and fix menus that weren't using <ul>

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-2
   change Code of Conduct non-digital signature registration URL, as requested by Celso

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-3
   fix pagetests, and minor cleanups to Code of Conduct interface

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-4
   fix syntax error

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-5
   fix pagetests; fix references to 'refuelling' in launch script

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-6
   fix pagetests

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-7
   merge rocketfuel, resolving 5 conflicts

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-8
   fix specification and calendar portlets

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-9
   merge rocketfuel

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-10
   fix bad merge of resources.zcml; fix bug 1968

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-11
   fix errors from self-review

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-12
   merge rocketfuel

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-13
   merge rocketfuel, resolve 4 conflicts

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-14
   deactionize ticket system portlets

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-15
   merge rocketfuel, resolving 2 conflicts

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-16
   fixes from kiko's review

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-17
   merge rocketfuel, resolving 1 conflict

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-18
   remove overeager Branches link; clean up ShipIt Requests form

 * mpt@canonical.com/launchpad--deactionizing--0508--patch-19
   [trivial] deactionize cveset, malone, productset, sprints

 * mpt@canonical.com/launchpad--decruftify-c--1--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-84

 * mpt@canonical.com/launchpad--decruftify-c--1--patch-1
   clean up templates starting with 'c'

 * mpt@canonical.com/launchpad--decruftify-c--1--patch-2
   merge rocketfuel, resolve conflicts

 * mpt@canonical.com/launchpad--decruftify-c--1--patch-3
   fix missing '/' in launchpad.css

 * mpt@canonical.com/launchpad--decruftify-c--1--patch-4
   fix pagetests

 * mpt@canonical.com/launchpad--decruftify-c--1--patch-5
   typo fix

 * mpt@canonical.com/launchpad--devel--0--patch-84
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-85
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-86
   redo CSS for listboxes, and update Rosetta prefs template to match

 * mpt@canonical.com/launchpad--devel--0--patch-87
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-88
   fix pagetest

 * mpt@canonical.com/launchpad--devel--0--patch-89
   tweak confirmation message messages, distro examples, and fix-request page headings

 * mpt@canonical.com/launchpad--devel--0--patch-90
   fix fmt:text-to-html to work with empty strings, and use it in bug and task pages

 * mpt@canonical.com/launchpad--devel--0--patch-91
   revert to ninja-star person icon, again

 * mpt@canonical.com/launchpad--devel--0--patch-136
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-137
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-138
   typo fix to Rosetta bar charts; include bar chart legend on distrorelease language page

 * mpt@canonical.com/launchpad--devel--0--patch-139
   merge rocketfuel

 * mpt@canonical.com/launchpad--spec-tracker--0509--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-168

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-1
   remove empty portlet

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-2
   ZCML cleanup

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-3
   cut unnecessary words from new-specification page

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-4
   begin tidying individual spec page

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-5
   restore spec actions portlet

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-6
   fix pagetest

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-7
   merge rocketfuel

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-8
   add facets to zcml

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-9
   clean up specification portlets

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-10
   fix pagetest

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-11
   tidy page titles

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-12
   merge rocketfuel, resolving 1 conflict and fixing spec page title

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-13
   facet= and indentation fixes from SteveA's review

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-14
   pagetest fix

 * mpt@canonical.com/launchpad--spec-tracker--0509--patch-15
   page title fix from SteveA's re-review

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2050
   [trivial] Fix bugs 1284, 1285 - no links to product releases from product or productseries

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2051
   [r=salgado] some cleanup of calendar templates

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2052
   [r=BjornT] DisplayingParagraphsOfText

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2053
   [r=jamesh] testrunner improvements (?)

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2054
   [r=SteveA] add addLanguage/removeLanguage to IPerson, pagetest for the Rosetta prefs page

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2055
   [r=salgado] clean up templates with names starting with 'c'

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2056
   [trivial] Switch production to directDelivery temporarily

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2057
   [trivial] Fix bugs 1284, 1285 - no links to product releases from product or productseries

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2058
   [trivial] Add KarmaActionName to dbschema.__all__ and add a distinct to IKarmaActionSet.selectByCategoryAndPerson() (fix https://launchpad.ubuntu.com/malone/bugs/1260).

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2059
   [trivial] RDF formatting changes per bug 1248

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2060
   [r=SteveA] another round of import fascism and other cleanups

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2061
   [r=jamesh] Fix buttress test coverage.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2062
   [trivial] Bug 130: Multiple paragraphs in DOAP project description field

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2063
   [trivial] Bug 1289: Make product text less bold

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2064
   [r=spiv,jamesh] Auto Buildd System implementation.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2065
   [r=kiko] simple clean up and little fixes

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2066
   [trivial] Comments for IPerson.addLanguage() and IPerson.removeLanguage().

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2067
   [trivial] more import fascist improvements

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2068
   [r=mpt,jamesh,stub] New GPG/CoC features, new key validation workflow, encrypt/decrypt support, reviewed UI and GPGKey.revoked renamed to active.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2069
   [rs=SteveA for Tales][trivial for Malone] Make Malone usable in Konqueror and Safari

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2070
   [trivial] de-underline bug stats links

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2071
   [trivial] Index required by Gina

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2072
   [trivial] import BugSetBase from the correct place.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2073
   [trivial] improved warning output for tests, and fixed a bunch of ambiguous use of select results warnings. some xxx comments left in person code. one untested codepath in hct backend.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2074
   [trivial] typo on browser logintoken and testing new email addition and not adding revoked uid with the modified 1024D/DFD20543 key.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2075
   [trivial] revert person icon, again

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2076
   [r=jamesh] Utility to run meld on a launchpad branch against the most recent merge of rocketfuel

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2077
   [trivial] fixed up some unneeded imports

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2078
   [trivial] Reapplied daf's patch to use twisted 2.0 with launchpad (Closes: #1385)

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2079
   [trivial] Add upstream librarian support for the staging environment

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2080
   [trivial] New database baseline

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2081
   [trivial] Add karmacacheupdater section to production config

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2082
   [trivial] Bug 1391: RDF export format still missing bits

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2083
   [trivial] New database baseline

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2084
   Buildd packaging stuff. r=jamesh,daf

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2085
   [r=salgado] implement the From address part of
 FormattingBugNotifications

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2086
   [trivial] make the login page work when there are several query parameters that have the same name.  this fixes a lot of the broken links on staging.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2087
   Fix PersonSet's methods to always return results ordered by Person._defaultOrder if no orderBy argument is provided. r=SteveA

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2088
   [trivial] Fix BugTaskSet.search() (just one argument that was not consistent with the column name it should be matched) and add code that uses the fixed part to make sure it's tested.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2089
   [trivial] fix presentation details for coc pages, pagetest added.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2090
   Remove obsolete code from the librarian, expand zopeless transaction tests a little, remove redundant begin from Librarian test tearDown.  r=SteveA.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2091
   [trivial] fix product links in portal when used on product page

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2396
   [r=SteveA,BjornT] Fix bug 1585: returning unconfirmed email addresses from the authserver.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2397
   [r=SteveA,BjornT] Make the Twisted daemon runner more reliably fail when the daemon fails, e.g. if it cannot listen on a port.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2398
   [trivial] Ordering GPGKeySet base queries to avoid warnings when slicing results.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2399
   Transfer team membership records when merging people. r=stub

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2400
   [r=BjornT] Clean up fix requests table in bug page, fixing bug 1989

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2401
   [r=BjornT] Clean up fix requests table in bug page, fixing bug 1989

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2402
   [r=BjornT] Clean up fix requests table in bug page, fixing bug 1989

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2403
   [r=SteveA] clean up spec tracker pages

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2404
   [r=SteveA] clean up spec tracker pages

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2405
   [r=SteveA] clean up spec tracker pages

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2406
   [trivial] Switch on db_statement_timeout in production Launchpad instances

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2407
   [trivial] Tweak Gina warning levels

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2408
   r=spiv new tests for some menu system functionality.  reorganisation of browser publication code.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2409
   [trivial] add table and classes for development manifests

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2410
   Make publisher aware of d-i. Fix up some non-PEP8ish code along the way. Make sure overrides are pocket aware. r=lifeless

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2411
   Fix the person-edit view to preserve the message displayed by the edit view when we redirect to their new canonical_url (as a consequence of a name change). r=kiko

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2412
   [trivial] Use a different <form> for adding a new email address in a person's email address page. Fix https://launchpad.ubuntu.com/malone/bugs/1348.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2413
   Lots of small fixes suggested by people who tried shipit since it reached staging. r=kiko

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2414
   Buildd slave chroot tool. r=spiv

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2415
   [trivial] db tables for sprints

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2416
   [trivial] launchpad-error-reports is a CLOSED mailing list (and always has been!)

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2417
   r=bjornt merge support for hints and ancestry of manifests.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2418
   rollout failed patch

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2419
   [r=spiv] script librarian logging

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2420
   [r=jamesh] rework cve structure, and general polish

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2421
   r=bjornt merge support for hints and ancestry of manifests.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2422
   [trivial] hide dups from the assigned bugs report; improve the wording
 and pagetest

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2423
   [r=kiko for most, trivial for the rest] Major cleanup of portlets, minor cleanup of Codes of Conduct and ShipIt; fixes bug 1968 and bug 2103

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2424
   [r=stevea]. make bug notifictions concerning the same bug be part of the same email thread.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2425
   r=bjornt greatly improved error pages in pagetests and debug port.  introduced new url for a  debug root page.  fixed bug when redirecting for logging out.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2426
   Implement Distribution.getDistroReleaseAndPocket() for Keybuk. r=sabdfl

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2427
   [r=lifeless] Launchpad Auto Build System User Interface Prototype (buildfarm UI) also minor fixes for buildd infrastructure, still needing mpt love.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2428
   [r=kiko] remove more dirty database imports

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2429
   [trivial] Fix for bug 2296: Broken LInk (system error); the problem was that browser.pofile.POFileView.getPluralFormExpression was fragile. I moved the code to POHeader(), added tests and added an XXX to ensure we keep track of bugs

 * rocketfuel@canonical.com/launchpad--devel--0--patch-2430
   [trivial] Fix for bug # 2374 and bug # 2376, GPG/CoC missapplied messages.

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2290

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-1
   add hint field to manifest entry table

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-2
   implement stuff for manifest ancestry (TheDescentOfMan...ifests)

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-3
   feedback from dba review

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-4
   formatting fixes from review

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-5
   merge up to merge point

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-6
   acknowledge back-out without accepting it

 * scott@canonical.com--2005/launchpad--manifest-hints-and-ancestry--0--patch-7
   fully catch up

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1892

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-1
   implemented DisplayingParagraphsOfText

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-2
   added explanatory comments

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-3
   tidied up regular expression definitions

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-4
   updated to latest DisplayingParagraphisOfText spec, with new tests, and improved processing, and omre coments.

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-5
   merge from rf, resolving conflict in tales.txt

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-6
   removed tales-to-be-removed.txt

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-7
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-8
   implemented suggestions from bjorn's review

 * steve.alexander@canonical.com--z8/launchpad--DisplayingParagraphsOfText--0--patch-9
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-44
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-45
   removed unused import

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-46
   Changed tests so they don't warn about slicing an unordered select results.

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-47
   fixed issues with ambiguously ordered select results.  left XXX comments for other issues with the results.

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-48
   added extensive warning handler

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-49
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-50
   improvements to the warninghandler

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-51
   changed some sqlobject use in the hct backend to avoid ambiguous ordering of result set warnings.

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-52
   removed some unused imports

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-53
   removed an item from warned imports

 * steve.alexander@canonical.com--z8/launchpad--LaunchpadMenus--0--patch-54
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-17
   Added IDBSchemaItem interface for documentation.  Added Item to the names exported from dbschema.

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-18
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-19
   trivial comment correction in dbschema

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-20
   minor improvement in fascist.  now gives nicer error message when a fascist exception is raised.

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-21
   made the fascist be lenient for importing names into tests

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-22
   various fixes to dbschema

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-23
   dbschema fix missed

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-24
   darn, was wrong way around before.  really allow imports of any names into test modules now.

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-25
   unfortunately merged from rf and did fascist work.  baz was being awkward about 'Partial commit with added directories is not yet supported', so this is all one commit.

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-26
   move import fascist into its own module.

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-27
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-28
   improved fascist

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-29
   merge from rf

 * steve.alexander@canonical.com--z8/launchpad--trivial--0--patch-30
   fixed bug where the login page would not work if the query string contained the same parameter name more than once.

 * steve.alexander@canonical.com/launchpad--BetterErrorPages--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2420

 * steve.alexander@canonical.com/launchpad--BetterErrorPages--0--patch-1
   improved error pages, especially for pagetests and in debug mode.  reenabled root debug index page on a special url.  removed some unused templates and layers.

 * steve.alexander@canonical.com/launchpad--BetterErrorPages--0--patch-2
   removed xxx comment and comented out redundant zcml directive

 * steve.alexander@canonical.com/launchpad--BetterErrorPages--0--patch-3
   improved docstring for PageTestLayer, as per review comment from bjorn

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-57
   merge from rf

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-58
   corrected typo of what facet the specification pages are on

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-59
   corrected stupid error.  will remove correction and write test now...

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-60
   improved tests to take account of problems found

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-61
   trivial change to fix doc in doctest

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-62
   small cleanup in tales.py

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-63
   remove unused imports from canonical/publication.py

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-64
   moved some events into launchpad.interfaces, moved server definitions into webapp.servers

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-65
   split up the ugly heap of canonical/publication.py into more manageable sections, moving a lot of it to more meaningful places in 'webapp'.

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-66
   publication reorg

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-67
   more publisher refactorings.  move the root object into webapp/publisher.py

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-68
   argh\! baz' slowness tempted me to alter the file before baz was finished.  recommitting what i indended last time.

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-69
   made the RootObject not an ILocation.  isn't needed any more

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-70
   added xxx note about the EndRequestEvent commented out interfaces in interfaces/launchpad.py

 * steve.alexander@canonical.com/launchpad--Menus--0--patch-71
   merge from rf

 * stuart.bishop@canonical.com/launchpad--celso--1--base-0
   tag of celso.providelo@canonical.com/launchpad--gpg-ng--0--patch-48

 * stuart.bishop@canonical.com/launchpad--celso--1--patch-1
   Tweak db patch

 * stuart.bishop@canonical.com/launchpad--dba--6--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-2070

 * stuart.bishop@canonical.com/launchpad--dba--6--patch-1
   Index for Gina

 * stuart.bishop@canonical.com/launchpad--dba--6--patch-2
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--dba--6--patch-3
   New database baseline

 * stuart.bishop@canonical.com/launchpad--dba--6--patch-4
   And archive some db patches I missed...

 * stuart.bishop@canonical.com/launchpad--librarian--1--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1806

 * stuart.bishop@canonical.com/launchpad--librarian--1--patch-1
   Add download_url parameter to librarian config

 * stuart.bishop@canonical.com/launchpad--librarian--1--patch-2
   Add config.librarian.server.upstream_url to config. Not yet wired up

 * stuart.bishop@canonical.com/launchpad--librarian--1--patch-3
   Fix URL generation

 * stuart.bishop@canonical.com/launchpad--librarian--1--patch-4
   Merge Andrew's work

 * stuart.bishop@canonical.com/launchpad--librarian--1--patch-5
   Merge from Rocketfuel and resolve conflicts

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--base-0
   tag of stuart.bishop@canonical.com/launchpad--trivial--0--patch-102

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-1
   Work in progress

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-2
   LibrarianFormatter to store script exceptions in the Librarian, and Librarian fixes

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-3
   Work in progress

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-4
   All tests passing

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-5
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-6
   Fix a Librarian test

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-7
   Review feedback updates

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-8
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-9
   Fix storage module and tests

 * stuart.bishop@canonical.com/launchpad--librarianscriptlogging--0--patch-10
   Break functional test into two (1 unit, 1 functional) due to Bug#2338

 * stuart.bishop@canonical.com/launchpad--rocketmeld--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1976

 * stuart.bishop@canonical.com/launchpad--rocketmeld--0--patch-1
   Helper to run meld on a launchpad branch against rocketfuel

 * stuart.bishop@canonical.com/launchpad--rocketmeld--0--patch-2
   Updates from review

 * stuart.bishop@canonical.com/launchpad--rocketmeld--0--patch-3
   Post review tweak

 * stuart.bishop@canonical.com/launchpad--rocketmeld--0--patch-4
   Add karmacacheupdater section to production config

 * stuart.bishop@canonical.com/launchpad--testrunner--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1981

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-1
   Make test_on_merge.py kill tests if they take too long and refuse to run if there are existing database connections open

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-2
   Mmmm.... Curry....

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-3
   Splurge on Rocketfuel and disolve cornflakes

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-4
   Tweaks from review

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-5
   Wait for test process to die