From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Mon, 3 Sep 2012 20:33:16 +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=d83d96725098f4f3e4be9ff0699ad39ca0aa8d3f;p=scpubgit%2Fstemmaweb.git

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

d83d96725098f4f3e4be9ff0699ad39ca0aa8d3f