OpenSourceFieldlinguistics/FieldDB — pull request #667 by Kedersha (2012-11-01 15:39:36+00:00)
Title: merge conflicts from 2 possible sources...

1) localization code
2) attempts to get import of XML to work