psi-plus/main — pull request #14 by FlorianFieber (2014-09-28 20:03:52+00:00)
Title: Fix 0820 after upstream merge

Fix after psi-im/psi#160