mmzeeman/zotonic — pull request #3 by kaos (2013-03-14 11:13:59+00:00)
Title: merged with master

Merged in changes from master.

NOT tested, as of now.. will do that later today.