Merge remote-tracking branch 'origin/master'

README.rst

@@ -6,6 +6,8 @@ dpaste
     :target: https://travis-ci.org/bartTC/dpaste
 .. image:: https://coveralls.io/repos/bartTC/dpaste/badge.png?branch=master
     :target: https://coveralls.io/r/bartTC/dpaste?branch=master
+.. image:: https://api.flattr.com/button/flattr-badge-large.png
+    :target: https://flattr.com/submit/auto?user_id=bartTC&url=https%3A%2F%2Fgithub.com%2FbartTC%2Fdpaste
 
 dpaste is a Django based pastebin. It's intended to run separately but its also
 possible to be installed into an existing Django project like a regular app.

dpaste/templates/dpaste/snippet_form.html

@@ -43,6 +43,8 @@
 {% if is_new %}
     <div class="news">
         <h2>Recent Changes</h2>
+
+        <p>{{ DPASTE_NEW_EXTRA }}</p>
         <p>dpaste now supports one time snippets as an option in the
             expiration dropdown. One time snippets are deleted as soon as
             another person views the snippet.</p>