Merge tag '0.3.0' into debian

Tag bitmask version 0.3.0

Conflicts:
	.coveragerc
	.tx/config
	NEWS.rst
	setup.cfg
	src/leap/base/checks.py
	src/leap/base/exceptions.py
	src/leap/base/tests/test_checks.py
	src/leap/eip/checks.py
	src/leap/gui/firstrun/login.py
	src/leap/gui/locale_rc.py
	src/leap/util/polkit.py
	tests/test_qt_environment.py
	tox.ini

1 files changed, 17 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 26838e5c..7712b0d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,13 @@
 *.swp
 *.swo
 *.pyc
+*.log
+*.*~
 .*
+*_rc.py
+ui_*.py
+!.coveragerc
+!.tx
 bin/
 build/
 core
@@ -14,5 +20,16 @@ lib/
 local/
 man/
 share/
+src/leap/util/reqs.txt
 src/leap.egg-info/
 src/leap_client.egg-info
+src/leap/_branding.py
+src/leap/certs/*.pem
+src/*.egg-info
+src/pysqlcipher
+pkg/osx/dist
+pkg/osx/build
+MANIFEST
+_trial_temp*
+config/*
+CHANGELOG~