Merge branch 'develop'

Conflicts:
	README.md
	alot/defaults/alot.rc
	alot/init.py
	alot/settings.py

1 files changed, 1 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index 62b8fd27..301d6ee3 100755
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,7 @@ setup(name='alot',
       author_email=alot.__author_email__,
       url=alot.__url__,
       packages=['alot'],
+      package_data={'alot': ['defaults/alot.rc', 'defaults/notmuch.rc']},
       scripts=['bin/alot'],
       license=alot.__copyright__,
       requires=[