BUG: quantile ignores axis kwarg
Merge branch 'quantile-axis' of https://github.com/TomAugspurger/pandas into TomAugspurger-quantile-axis

Conflicts:
	doc/source/v0.14.1.txt
make nanops._maybe_null_out work with complex numbers ( issue #7353 )
Merge pull request #7428 from toddrjen/nancomplex

make nanops._maybe_null_out work with complex numbers ( issue #7353 )
make nanops work when ndim==1 and axis==0 ( issue #7354 )