Update AUTHORS and CHANGELOG for #1837

nicoddemus · nicoddemus · commit b54ea74d4d0f · 2016-08-22T17:59:42.000-03:00
diff --git a/AUTHORS b/AUTHORS
@@ -81,6 +81,7 @@ Lukas Bednar
 Maciek Fijalkowski
 Maho
 Marc Schlaich
+Marcin Bachry
 Mark Abramowitz
 Markus Unterwaditzer
 Martijn Faassen
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,11 +6,15 @@
 
 *
 
+* Fix loader error when running ``pytest`` embedded in a zipfile.
+  Thanks `@mbachry`_ for the PR.
+
 *
 
 *
 
 
+.. _@mbachry: https://github.com/mbachry
 
 .. _#1822: https://github.com/pytest-dev/pytest/issues/1822
 

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,15 @@`
`6`	`6`
`7`	`7`	`*`
`8`	`8`
	`9`	+* Fix loader error when running ``pytest`` embedded in a zipfile.
	`10`	+ Thanks `@mbachry`_ for the PR.
	`11`	`+`
`9`	`12`	`*`
`10`	`13`
`11`	`14`	`*`
`12`	`15`
`13`	`16`
	`17`	`+.. _@mbachry: https://github.com/mbachry`
`14`	`18`
`15`	`19`	`.. _#1822: https://github.com/pytest-dev/pytest/issues/1822`
`16`	`20`