korpling/ANNIS — pull request #361 by amir-zeldes (2014-10-21 15:46:13+00:00)
Title: Merge pull request #4 from korpling/develop

Merge September korpling changes into amir-zeldes/ANNIS