Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Apr 18 09:59:37 2014 +0200

Merge branch 'upstream'.

---