Merge updates to pull request errietta/login-3622
authortla <tla@mit.edu>
Fri, 6 Feb 2015 15:54:22 +0000 (16:54 +0100)
committertla <tla@mit.edu>
Fri, 6 Feb 2015 15:54:22 +0000 (16:54 +0100)
commite8f28d98de978fcc3e81ef860438da987e97784a
tree639059b12baed576a02053b1a3ab1f27b74f92cd
parent7c6c2a1a767a627844ce04d4ad4fb6f363ad2d52
parent3fe754ff12ffc51f222ffe591f52d08802baac85
Merge updates to pull request errietta/login-3622

Conflicts:
lib/Text/Tradition/Directory.pm