Fixed regular expression for Python 2.6 Conflicts: 	astropy/tests/pytest_plugins.py
Fixed regular expression for Python 2.6
Conflicts:
	astropy/tests/pytest_plugins.py

StuartLittlefair/astropy,DougBurke/astropy,astropy/astropy,dhomeier/astropy,mhvk/astropy,mhvk/astropy,pllim/astropy,MSeifert04/astropy,aleksandr-bakanov/astropy,MSeifert04/astropy,lpsinger/astropy,bsipocz/astropy,kelle/astropy,larrybradley/astropy,AustereCuriosity/astropy,larrybradley/astropy,StuartLittlefair/astropy,stargaser/astropy,joergdietrich/astropy,tbabej/astropy,mhvk/astropy,mhvk/astropy,DougBurke/astropy,tbabej/astropy,joergdietrich/astropy,AustereCuriosity/astropy,lpsinger/astropy,joergdietrich/astropy,saimn/astropy,kelle/astropy,astropy/astropy,stargaser/astropy,larrybradley/astropy,bsipocz/astropy,saimn/astropy,pllim/astropy,tbabej/astropy,AustereCuriosity/astropy,saimn/astropy,aleksandr-bakanov/astropy,astropy/astropy,saimn/astropy,stargaser/astropy,kelle/astropy,joergdietrich/astropy,DougBurke/astropy,tbabej/astropy,DougBurke/astropy,pllim/astropy,larrybradley/astropy,bsipocz/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,MSeifert04/astropy,pllim/astropy,dhomeier/astropy,AustereCuriosity/astropy,astropy/astropy,mhvk/astropy,joergdietrich/astropy,dhomeier/astropy,bsipocz/astropy,tbabej/astropy,funbaker/astropy,MSeifert04/astropy,StuartLittlefair/astropy,kelle/astropy,pllim/astropy,lpsinger/astropy,funbaker/astropy,astropy/astropy,larrybradley/astropy,dhomeier/astropy,funbaker/astropy,lpsinger/astropy,AustereCuriosity/astropy,kelle/astropy,aleksandr-bakanov/astropy,funbaker/astropy,stargaser/astropy,saimn/astropy,dhomeier/astropy,aleksandr-bakanov/astropy,lpsinger/astropy