elkarte/Elkarte — pull request #1908 by emanuele45 (2014-12-06 16:36:21+00:00)
Title: Dev up

Bring 1.0.2 into dev