Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

Module: bugzilla
Branch: master
Commit: 0205fb7815123c9703815447aedf89fe6a9bc9ed
URL:    http://source.winehq.org/git/bugzilla.git/?a=commit;h=0205fb7815123c97038154...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Dec 24 14:37:44 2015 +0100

Merge branch 'upstream'.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---