Merge branch ‘master’ of github.com:bbajaj/relman_nag_tool Conflicts: Test.pyc bugzilla/init.pyc bugzilla/agents.pyc bugzilla/fields.pyc bugzilla/models.pyc bugzilla/utils.pyc demo.py email_nag.pyc phonebook.pyc requirements.txt stackato.yml templates/base.html templates/create_template.html templates/show_queries.html templates/show_templates.html
Merge branch ‘master’ of github.com:bbajaj/relman_nag_tool
Conflicts: Test.pyc bugzilla/init.pyc bugzilla/agents.pyc bugzilla/fields.pyc bugzilla/models.pyc bugzilla/utils.pyc demo.py email_nag.pyc phonebook.pyc requirements.txt stackato.yml templates/base.html templates/create_template.html templates/show_queries.html templates/show_templates.html