Merge branch 'master' of github.com:tla/stemmatology
authortla <tla@mit.edu>
Tue, 28 Aug 2012 10:55:45 +0000 (12:55 +0200)
committertla <tla@mit.edu>
Tue, 28 Aug 2012 10:55:45 +0000 (12:55 +0200)
commitb7369da3b009ba4732430c4b48cb8a5001e92f80
treef9284938e1e9bab0bf7829977b1cc1ba16721f4c
parent0f093b350359832feb21ddf4895c140e27e655a5
parent8e61812dc63608c7db7aa2c562a3ff490255543a
Merge branch 'master' of github.com:tla/stemmatology