Rev 6555: (jelmer) Merge the grep plugin into the core. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6555 [merge]
revision-id: pqm at pqm.ubuntu.com-20120823155832-tqnebdscxhd8euki
parent: pqm at pqm.ubuntu.com-20120823142438-804xd3yql622ahhp
parent: jelmer at samba.org-20120823150434-qq2olqvr4k07kpu4
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-08-23 15:58:32 +0000
message:
  (jelmer) Merge the grep plugin into the core. (Jelmer Vernooij)
added:
  bzrlib/_termcolor.py           color.py-20100522030533-sp3u5pznhku6rs1e-1
  bzrlib/plugins/grep/           tree_root-20100223093227-dy2114pd9rbvp9n5-1
  bzrlib/plugins/grep/.bzrignore bzrignore-20100608030533-icxuefnecwqd2l43-1
  bzrlib/plugins/grep/NEWS       news-20100311043821-8zskc9nxkk2yfhkm-1
  bzrlib/plugins/grep/__init__.py __init__.py-20100223093233-32okqufaux8x9bxu-1
  bzrlib/plugins/grep/cmds.py    cmds.py-20110220003353-wpnkwxsmule03h26-1
  bzrlib/plugins/grep/grep.py    grep.py-20100224040248-5l1gry8zlivaogou-1
  bzrlib/plugins/grep/test_grep.py test_grep.py-20100224054720-oyhugc0013hwtmba-1
modified:
  bzrlib/tests/features.py       features.py-20090820042958-jglgza3wrn03ha9e-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1

Diff too large for email (3491 lines, the limit is 1000).