Bailey Ling c1e74d72e0 Merge branch 'ext' ...

Conflicts:
	autoload/airline/extensions.vim

2013-08-06 15:26:32 +00:00

..

airline.vim

Merge branch 'ext'

2013-08-06 15:26:32 +00:00