Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

Module: bugzilla
Branch: master
Commit: 4afc6076fee29d641540378623073b99717bc2db
URL:    http://source.winehq.org/git/bugzilla.git/?a=commit;h=4afc6076fee29d64154037...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Dec 11 12:48:14 2013 +0100

Merge branch 'upstream'.

---