oaeproject/3akai-ux — pull request #3171 by nicolaasmatthijs (2013-08-21 15:13:39+00:00)
Title: Incorporate recent puppet-hilary nginx.conf changes

Bringing the 3akai-ux nginx.conf file in sync (where appropriate) with the puppet-hilary 3akai-ux file