Merge branch 'master' of ../python-bugzilla openSUSE-1
authorjan matejek <jmatejek@suse.cz>
Wed, 25 Jan 2012 16:46:00 +0000 (17:46 +0100)
committerjan matejek <jmatejek@suse.cz>
Wed, 25 Jan 2012 16:46:00 +0000 (17:46 +0100)
commit31cae028bfa099222055476638dc3d5f61f442df
tree2f3adbb506b633f44c0db99f41dc23d270106b62
parentecfc614863186f8b70846e388e038d3c2385f630
parent3c9cdcfe344323e7acc86aeeead2972f9013fa71
Merge branch 'master' of ../python-bugzilla

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