From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Sun, 16 Jun 2013 18:56:00 +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=4c5efc084c095e443c7d2efc9624160e855cecb2;p=scpubgit%2Fstemmaweb.git

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

4c5efc084c095e443c7d2efc9624160e855cecb2