Merge branch 'master' into multi-index-join

Author: harisbal

pandas/tests/reshape/merge/test_merge.py

@@ -906,6 +906,7 @@ class TestMergeDtypes(object):
         Series([1, 2], dtype='uint64'),
         Series([1, 2], dtype='int32')
     ])
+
     def test_different(self, right_vals):
 
         # ~ 40000000 possible unique groups