Merge branch '0.6.x'

README.rst

@@ -81,7 +81,7 @@ Licence
 Donate
 ------
 
-Bitcoins: 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS
+Bitcoin address: 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS
 
 .. _Converse.js: http://conversejs.org
 .. _strophe.js: http://strophe.im/strophejs

index.html

@@ -84,8 +84,7 @@
             into Django. It adds single-signon-support (SSO) support and a database model to store XMPP credentials.
         </li>
         <li><h4><a href="http://roundcube.net" target="_blank">Roundcube</a></h4>
-            <strong><a href="https://github.com/priyadi/roundcube-converse.js-xmpp-plugin" target="_blank">roundcube-converse.js-xmpp-plugin</a></strong>
-            is a plugin for Roundcube Webmail. It's README states that it's still a work in progress.
+            <strong><a href="https://github.com/thomascube/roundcube-converse.js-xmpp-plugin" target="_blank">roundcube-converse.js-xmpp-plugin</a></strong> is a plugin for Roundcube Webmail.
         </li>
     </ul>
 
@@ -162,9 +161,12 @@
     <p><strong>Converse.js</strong> is released under both the <a href="http://opensource.org/licenses/mit-license.php" target="_blank">MIT</a> 
     and <a href="http://opensource.org/licenses/GPL-2.0" target="_blank">GPL</a> licenses.</p>
 
+    <h2>Donate</h2>
+    <p><strong>Bitcoin address:</strong> 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS</p>
+
     <h2>Contact</h2>
     <p>You can follow me on <strong><a href="http://twitter.com/jcopkode" target="_blank">Twitter</a></strong></p>
-    <p>My XMPP username is <strong>jc@opkode.im</strong>.</p>
+    <p>My XMPP handle is <strong>jc@opkode.im</strong>.</p>
     <p>Send me an email via this <a href="http://opkode.com/contact" target="_blank">contact form</a>.</p>
 </section>
 </div>