Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website

[Jeremy Newman]

Module: website
Branch: master
Commit: bc1e11feed2a1ee59c7271374fe067d2c309ccd1
URL:    http://source.winehq.org/git/website.git/?a=commit;h=bc1e11feed2a1ee59c7271374fe067d2c309ccd1

Author: Jeremy Newman <jnewman at codeweavers.com>
Date:   Fri Jan 22 12:09:56 2016 -0600

Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website

---