From: Tara L Andrews <tla@mit.edu>
Date: Fri, 29 Aug 2014 21:10:14 +0000 (+0200)
Subject: Merge branch 'master' of github.com:tla/stemmaweb
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b5122b9d6798e0f9f4dab9f57e39979a15787c8;p=scpubgit%2Fstemmaweb.git

Merge branch 'master' of github.com:tla/stemmaweb
---

7b5122b9d6798e0f9f4dab9f57e39979a15787c8