<NME> MANIFEST.in
<BEF> include README.rst COPYING requirements.txt
recursive-include modoboa *.html *.js *.css *.png *.po *.mo *.json *.gif *.ttf *.woff
recursive-include modoboa/core/templates *.tpl
recursive-include modoboa/core/commands/templates *.tpl
recursive-include modoboa/core/commands/templates *.tpl
recursive-include doc *

<MSG> Merge branch 'master' into split_applications

Conflicts:
	modoboa/extensions/postfix_relay_domains/factories.py
	modoboa/extensions/stats/graphics.py
	modoboa/extensions/stats/management/commands/logparser.py
	modoboa/extensions/webmail/templates/webmail/compose.html
	modoboa/extensions/webmail/validators.py

<DFF> @@ -1,4 +1,4 @@
-include README.rst COPYING requirements.txt
+include README.rst LICENSE requirements.txt
 recursive-include modoboa *.html *.js *.css *.png *.po *.mo *.json *.gif *.ttf *.woff
 recursive-include modoboa/core/templates *.tpl
 recursive-include modoboa/core/commands/templates *.tpl

Merge branch 'master' into split_applications