elkarte/Elkarte — pull request #784 by emanuele45 (2013-08-28 08:13:55+00:00)
Title: Error patch

Fixed conflicts in #774