[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.2-41-gd3c369b

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  d3c369bc150023bcae6b8a413d63da4e4e3fe666 (commit)
       via  f83bd2567d8452d4ec4a40aea4e606c0005ead3a (commit)
       via  0c2bcbdc0d1e16d745782c84d6adc8317b56597a (commit)
      from  464e3aea37b4c59d442cd10bc65ed20c3bd7fd72 (commit)

Summary of changes:
 lib/RT/Attachment.pm        |    5 ++++-
 lib/RT/Crypt/GnuPG.pm       |    4 ++--
 lib/RT/Util.pm              |   23 ++++++++++++++++++++++-
 t/web/attachment_encoding.t |    2 +-
 4 files changed, 29 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit d3c369bc150023bcae6b8a413d63da4e4e3fe666
Merge: 464e3ae f83bd25
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Sep 6 13:44:39 2011 -0400

    Merge branch '4.0/unicode-recommended-filename' into 4.0-trunk
    
    Conflicts:
    	lib/RT/Attachment.pm

diff --cc lib/RT/Attachment.pm
index 73a2663,a5b0b91..0f6fcd2
--- a/lib/RT/Attachment.pm
+++ b/lib/RT/Attachment.pm
@@@ -78,7 -78,7 +78,8 @@@ use warnings
  use RT::Transaction;
  use MIME::Base64;
  use MIME::QuotedPrint;
 +use MIME::Body;
+ use RT::Util 'mime_recommended_filename';
  
  sub _OverlayAccessible {
    {

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