Merge branch 'stable_py2' into stable

a0b17027 · Christoph Groth · 5d79fc63 · b6cb7dd4 · a0b17027 · a0b17027
Commit a0b17027 authored 9 years ago by Christoph Groth
--- a/doc/templates/layout.html
+++ b/doc/templates/layout.html
@@ -209,7 +209,7 @@
    {%- endif %}
    </div>
 {%- endblock %}
-{%- if website_deploy %}    
+{%- if website_deploy %}
    <!-- Piwik -->
    <script type="text/javascript">
      var _paq = _paq || [];

--- a/setup.cfg
+++ b/setup.cfg
 [egg_info]
-tag_build = 
+tag_build =
 tag_date = 0
 tag_svn_revision = 0
-