From: tla <tla@mit.edu>
Date: Fri, 6 Feb 2015 15:54:22 +0000 (+0100)
Subject: Merge updates to pull request errietta/login-3622
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2Fstemmaweb.git;a=commitdiff_plain;h=e8f28d98de978fcc3e81ef860438da987e97784a

Merge updates to pull request errietta/login-3622

Conflicts:
	lib/Text/Tradition/Directory.pm
---

e8f28d98de978fcc3e81ef860438da987e97784a