eg. 'wrapper', 'category:python' or '"document database"'
Merge commit 'refs/merge-requests/158' of git://gitorious.digitalstrom.org/dss/dss-mainline into integration