From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Fri, 31 Aug 2012 22:11:20 +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=ae240632b36d6c597b01367359287cba6eb82f1e;p=scpubgit%2Fstemmaweb.git

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

ae240632b36d6c597b01367359287cba6eb82f1e