From: John Napiorkowski <jjn1056@yahoo.com>
Date: Mon, 27 Jul 2015 14:20:26 +0000 (-0500)
Subject: Merge branch 'cryptomail-master'
X-Git-Tag: 5.90096~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=6a7446627ba16c6012f76e097132403dc9201af0

Merge branch 'cryptomail-master'
---

6a7446627ba16c6012f76e097132403dc9201af0