[Merge] ~kick-d/ubuntu/+source/amavisd-new:master into ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master

[Kick In]

Kick In has proposed merging ~kick-d/ubuntu/+source/amavisd-new:master into ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master.

Requested reviews:
  Robie Basak (racb)

For more details, see:
https://code.launchpad.net/~kick-d/ubuntu/+source/amavisd-new/+git/amavisd-new/+merge/282326

Prepare merge for review
-- 
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 32183 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160112/74f2ba4d/attachment-0001.diff>