ZIMK/fwadmin — pull request #28 by pgolm (2013-04-17 08:29:36+00:00)
Title: Hotfix/self merge problem fix

:P