Merge branch 'release/v0.3' into develop
Merge branch 'hotfix/v0.3.1' into develop
Remove useless blank line
Reindent buildout at 24
Remove now useless server_error view in demo
Revert "Remove widont filter call, because only available at this time in zinnia v0.13.dev (unreleased)". Now the v0.13 is released.

This reverts commit 97ca2a2ebb1790eeb8211210964ab605896f8a3e.
Avoiding an open <h2>tag when entry-info is hidden

I was doing {% block entry-info %} {% endblock entryinfo%} in my custom template and found that <h2> was open when I was fixing the css. This should avoid the problem.
Merge pull request #5 from robertour/patch-1

Avoiding an open <h2>tag when entry-info is hidden
Fix translation context for "on" in bootstrap theme.

Is already fixed in zinnia base template: Fantomas42/django-blog-zinnia@f8808aeab3981b7c29fa922e52dd159bf3409e94
Merge pull request #6 from uKev/develop

Fix translation context for "on" in bootstrap theme.
Use alpha sorting
Update the versions of the components
Merge branch 'feature/update-buildout' into develop
Updating the settings of the demo
Updating the URLs of the demo and use a namespace of Zinnia
Update the comment form
Use the zinnia namespace for reversing URLs
Merge branch 'feature/update-zinnia-namespace' into develop
Update the author tag template
Rename templates accordingly to the latest version of Zinnia