Merge branch 'proppy-add-maintainer-file'

shin- · shin- · commit 62772b56ba8a · 2015-05-13T13:23:53.000-07:00
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -0,0 +1,3 @@
+Joffrey F <f.joffrey@gmail.com> (@shin-)
+Maxime Petazzoni <maxime.petazzoni@bulix.org> (@mpetazzoni)
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Joffrey F <[email protected]> (@shin-)`
	`2`	`+Maxime Petazzoni <[email protected]> (@mpetazzoni)`
	`3`	`+`