Merge branch 'upstream' into staging staging suse3
authorjan matejek <jmatejek@suse.cz>
Thu, 27 Jun 2013 16:16:41 +0000 (18:16 +0200)
committerjan matejek <jmatejek@suse.cz>
Thu, 27 Jun 2013 16:24:46 +0000 (18:24 +0200)
commit2d364c6e8a3a2151f5101ec670e90a216312a0d1
tree6921f4304fbbecb9c9467b0e102e2ceb8e17fcf3
parentfc4f91c7af711b9f3e830425e293dd5203508ae0
parent64d37d2e52abe0263ce1f815fdb8282c7d563ceb
Merge branch 'upstream' into staging

re-add nvlbugzilla
allow http basic auth again

Conflicts:
bugzilla/__init__.py
bugzilla/base.py
bugzilla/nvlbugzilla.py
bin/bugzilla
bugzilla/__init__.py
bugzilla/base.py