[Rt-commit] rt branch, master, updated. rt-4.1.6-257-g007d6e6

[Alex Vandiver]

The branch, master has been updated
       via  007d6e68fc093da713134c9c8a676e4e7a5bea0e (commit)
       via  8b4434e8f9db1733e10a4b0bacbc5af572ac2f5a (commit)
       via  e47b2465eb4cea04b8df6bf95182278de14724e7 (commit)
       via  304d27c4ec171e75aeee305a46563d4099b06abd (commit)
       via  ca575967752c051b3ef56287b634086f96e635df (commit)
       via  d5978462a43760264e6000529271ad1d45d6421a (commit)
       via  5b94723ec2d4fc0f9771a19a4122ab1ff707aedc (commit)
       via  b101fd3eb9761ebab4e6840c1c7f3b7cc99bb9d5 (commit)
       via  4b9d95dd6924712a7187a62204bdb4f3a124279a (commit)
       via  481c1d57f19ddebb819e3f427eab796b38281bfc (commit)
       via  428ac5d8a4b49f7bf1a7e0322e4dc7c8971bb91f (commit)
       via  37d5563e4fdc27649c0f252c5f7e245403273456 (commit)
       via  e613873845505b6b4f99b527c5489b31f069b29f (commit)
       via  82c5217789ac0f5d347602b5bad1c40c55072ebc (commit)
      from  c587d756e446852c7c3a4fa961e2bc08fcc194be (commit)

Summary of changes:
 README                                   | 4 ----
 lib/RT/Config.pm                         | 9 ---------
 lib/RT/Pod/HTML.pm                       | 2 +-
 sbin/rt-setup-database.in                | 4 ++--
 share/html/REST/1.0/Forms/ticket/comment | 4 ++++
 share/html/REST/1.0/ticket/comment       | 4 ++++
 t/web/installer.t                        | 1 +
 7 files changed, 12 insertions(+), 16 deletions(-)

- Log -----------------------------------------------------------------
commit 007d6e68fc093da713134c9c8a676e4e7a5bea0e
Merge: c587d75 8b4434e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Feb 13 00:44:43 2013 -0500

    Merge branch '4.0-trunk'
    
    Conflicts:
    	lib/RT/Tickets.pm
    
    The conflicted hunk in RT::Tickets, introduced by
    4.0/search-by-watcher-name-email, has already been equivalently handled
    by 4.2/search-by-watcher-name-email.


-----------------------------------------------------------------------