.
.
Merge branch 'master' of git://github.com/paulhybryant/vim-airline

Conflicts:
	autoload/airline/extensions/tabline.vim
.
.