Alexandre Julliard : Merge branch 'upstream'.

Mon May 16 20:51:54 CDT 2016

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue May 17 10:48:33 2016 +0900

Merge branch 'upstream'.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---