Merge branch 'master' into multi-index-merge

Author: harisbal

doc/source/merging.rst

@@ -1125,6 +1125,7 @@ This is equivalent but less verbose and more memory efficient / faster than this
 Joining with two multi-indexes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+
 As of Pandas 0.23.1 the :func:`Dataframe.join` can be used to join multi-indexed ``Dataframe`` instances on the overlaping index levels
 
 .. ipython:: python
@@ -1160,7 +1161,6 @@ For earlier versions it can be done using the following.
    pd.merge(left.reset_index(), right.reset_index(),
             on=['key'], how='inner').set_index(['key','X','Y'])
 
-.. _merging.merge_on_columns_and_levels:
 
 Merging on a combination of columns and index levels
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pandas/core/reshape/merge.py

@@ -1218,7 +1218,6 @@ def _complete_multilevel_join(left, right, how, dropped_levels,
 
     return join_levels, join_labels, join_names
 
-
 class _OrderedMerge(_MergeOperation):
     _merge_type = 'ordered_merge'