Merge branch 'master' of github.com:chorn/barcamproc.org
merged
merged