Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Feb 19 13:19:02 2014 +0100

Merge branch 'upstream'.

Conflicts:
	template/en/default/account/create.html.tmpl
	template/en/default/bug/create/user-message.html.tmpl
	template/en/default/global/common-links.html.tmpl

---