Merge branch 'master' of https://github.com/tla/stemmatology
authortla <tla@mit.edu>
Sat, 18 Apr 2015 12:21:09 +0000 (14:21 +0200)
committertla <tla@mit.edu>
Sat, 18 Apr 2015 12:21:09 +0000 (14:21 +0200)
commitc74c762829a95edad42ee808df7f829926e3225f
treeda6c30e06873da78960dd0f3b8c46d4ec28be021
parenteef2a5a960f3248d26810f8d6ca58dc6a402a336
parent083c4e2afbfa8000ccf6058fffff7aa9320bbe3f
Merge branch 'master' of https://github.com/tla/stemmatology