Changes to archive thelove@canonical.com/bazaar--devo--1.1

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.1--patch-106

2005-01-11 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-106

    Summary:
      change references to star-merge to merge in the UI, closes: #5284
    Revision:
      bazaar--devo--1.1--patch-106

    Patches applied:
    
     * robert.collins at canonical.com--general/bazaar--devel--1.1--patch-66
       change references to star-merge to merge in the UI, closes: #5284
    

    modified files:
     libarch/merge.c

    new patches:
     robert.collins at canonical.com--general/bazaar--devel--1.1--patch-66
     thelove at canonical.com/bazaar--devo--1.1--patch-106