From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Tue, 4 Sep 2012 22:19:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:tla/stemmatology
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1b34e0821cd08c0aaf277e7c91c355d9b248b5f7;p=scpubgit%2Fstemmaweb.git

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

1b34e0821cd08c0aaf277e7c91c355d9b248b5f7