Solinx/pyrocms — pull request #1 by Solinx (2013-02-13 14:58:16+00:00)
Title: Merging the Contact branches

Merging due to interrelated changes