f625681
Merge branch 'develop' into 'master' for release Conflicts: blockerbugs.spec blockerbugs/__init__.py blockerbugs/controllers/main.py blockerbugs/util/bz_interface.py