From fa84aae133f229a84b26924bdecf82ceeb99eafe Mon Sep 17 00:00:00 2001
From: Jay Kamat <github@jgkamat.33mail.com>
Date: Wed, 6 Apr 2016 02:42:19 -0400
Subject: [PATCH 1/2] Add basic editorconfig for enforcing style

---
 .editorconfig | 17 +++++++++++++++++
 MANIFEST.in   |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..645ced56e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+max_line_length = 79
+
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_size = 2
+
+[*.feature]
+max_line_length = 9999
+
diff --git a/MANIFEST.in b/MANIFEST.in
index c12c4a13e..85edb94e8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -25,6 +25,7 @@ recursive-exclude doc *.asciidoc
 include doc/qutebrowser.1.asciidoc
 prune tests
 prune qutebrowser/3rdparty
+exclude .editorconfig
 exclude pytest.ini
 exclude qutebrowser.rcc
 exclude .coveragerc

From e49db65e3356fd94301f84744311ffe5c1802434 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Apr 2016 18:54:45 +0200
Subject: [PATCH 2/2] Regenerate authors

---
 README.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.asciidoc b/README.asciidoc
index b35f7a643..dfd3eb3f7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -219,6 +219,7 @@ Contributors, sorted by the number of commits in descending order:
 * Matthias Lisin
 * Marcel Schilling
 * Jean-Christophe Petkovich
+* Jay Kamat
 * Helen Sherwood-Taylor
 * HalosGhost
 * Gregor Pohl