From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Wed, 26 Jun 2013 15:35:31 +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=6af994d2e7e48f80c74ea8e6cef7022f0a828875;p=scpubgit%2Fstemmaweb.git

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

6af994d2e7e48f80c74ea8e6cef7022f0a828875