Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Jan 22 09:08:12 2015 +0100

Merge branch 'upstream'.

---