Merge branch 'master' of github.com:tla/stemmatology
authorTara L Andrews <tla@mit.edu>
Tue, 11 Sep 2012 08:10:13 +0000 (10:10 +0200)
committerTara L Andrews <tla@mit.edu>
Tue, 11 Sep 2012 08:10:13 +0000 (10:10 +0200)
commit2d5c5be13c0cf2999d4d3c9ae1bc7ba83fbdf9f0
tree05cbde1557d246d89a0fe39bc736e9d5421ab644
parent7dda56688281d6b86ca3cc627d03b8d38343eaea
parentd34fdf7ba1442eabbce7517a243511bf699865b8
Merge branch 'master' of github.com:tla/stemmatology

Conflicts:
stemmaweb/lib/stemmaweb/Controller/Root.pm
stemmaweb/lib/stemmaweb/Controller/Root.pm