Merge branch 'master' of https://github.com/tla/stemmatology
authortla <tla@mit.edu>
Sun, 22 Dec 2013 21:46:57 +0000 (22:46 +0100)
committertla <tla@mit.edu>
Sun, 22 Dec 2013 21:46:57 +0000 (22:46 +0100)
commit2f259726ae4d4bd4502bfc1f5051475cb749bb54
treea3a7972302dc0e135a52b1a6522235e37463e334
parentc268ad5fbc2644fc41061e1698a6ffc98e9fd211
parentd8ef0a2be91677481c89aeaabbbedaa6302d65f6
Merge branch 'master' of https://github.com/tla/stemmatology