Merging functionality added, rough round the corners.
[scpubgit/stemmaweb.git] / .gitignore
2012-09-16 Tara L Andrews housekeeping