amcat/amcat — pull request #176 by vanatteveldt (2014-06-16 20:04:43+00:00)
Title: Merge into amcat

Creating the pull request so we can add comments