Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Tue Oct  7 17:14:08 2014 +0200

Merge branch 'upstream'.

---