Merge branch 'master' into gh-pages

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-0.5.2 (Unreleased)
+0.5.2 (2013-08-05)
 ------------------
 
 - Important security update. Don't expose the Strophe connection object globally. [jcbrand]

CONTRIBUTING.rst

@@ -28,8 +28,6 @@ Check that the tests pass
 Check that the Jasmine tests complete sucessfully. Open tests.html in your
 browser, and the tests will run automatically.
 
-You can see the current test output online, here: http://conversejs.org/tests.html
-
 On the command line you can run ``grunt test`` (if you have before run ``npm
 install``).
 

README.rst

@@ -48,7 +48,7 @@ Tests
 -----
 
 We use behavior-driven tests written with jasmine.js_. They can run in your
-browser (`see here`_) or in the command line via phantom.js_.
+browser or in the command line via phantom.js_.
 
 We use `Travis-CI`_ for continuous integration.
 
@@ -93,6 +93,5 @@ Licence
 .. _`conversejs.org`: http://conversejs.org
 .. _jquery: http://jquery.com
 .. _jasmine.js: http://pivotal.github.io/jasmine
-.. _`see here`: http://conversejs.org/tests.html
 .. _phantom.js: http://phantomjs.org
 .. _`Travis-CI`: https://travis-ci.org

index.html

@@ -114,9 +114,9 @@
 
     <h2>Tests</h2>
     <p>
-        We use the <a href="http://pivotal.github.io/jasmine"
+        We use the <a href="http://pivotal.github.io/jasmine" target="_blank">Jasmine</a> testing framework to write tests.
-        target="_blank">Jasmine</a> testing framework to write tests.
+        Tests can be run in the browser (just open tests.html) or in the
-        The tests can be run in the browser and can be viewed <a href="http://conversejs.org/tests.html" target="_blank">here</a>.
+        commandline via ``grunt test``.
     </p>
 
     <h2>Credits and Dependencies</h2>