From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Fri, 20 Jan 2012 13:07:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:tla/stemmatology
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a5647981a9c3d729ba1a8f49cdbd846354a76526;p=scpubgit%2Fstemmaweb.git

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

a5647981a9c3d729ba1a8f49cdbd846354a76526