Merge updates to pull request errietta/login-3622
tla [Fri, 6 Feb 2015 15:54:22 +0000 (16:54 +0100)]
Conflicts:
lib/Text/Tradition/Directory.pm


Trivial merge