zotonic/webzmachine — pull request #10 by kaos (2013-03-14 10:50:33+00:00)
Title: Merge changes from mmzeeman master

Merged changes from @mmzeeman. Please review and test. Once this is merged we can proceed with the stats merge.