Brianna Laugher 40fa7b25c5 Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master ... Fixed merge conflict in CHANGELOG		2015-08-08 18:54:53 +02:00
..
en	Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master	2015-08-08 18:54:53 +02:00