Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Apr 19 15:51:45 2014 +0200

Merge branch 'upstream'.

---