Merge branch 'master' into newbranching

CHANGELOG

@@ -1,4 +1,4 @@
-x.y.z
+2.8.x
 -----
 
 - (experimental) adapt more SEMVER style versioning and change meaning of 
@@ -9,6 +9,8 @@ x.y.z
 - Fix issue #766 by removing documentation references to distutils.
   Thanks Russel Winder.
 
+- Fix issue #411: Add __eq__ method to assertion comparison example.
+  Thanks Ben Webb.
 
 2.8.0
 -----------------------------

doc/en/assert.rst

@@ -200,7 +200,10 @@ now, given this test module::
    # content of test_foocompare.py
    class Foo:
        def __init__(self, val):
-            self.val = val
+           self.val = val
+
+       def __eq__(self, other):
+           return self.val == other.val
 
    def test_compare():
        f1 = Foo(1)