Merging DebConf changes

In the spirit of keeping the Debian delta as small as possible, I am submitting upstream a patch from DebConf (who based their code of conduct for their 2014 conference on the Linux Australia template).

Credit for this patch goes to Margarita Manterola.

See the [original patch](http://lists.debconf.org/lurker/message/20140904.221307.3c4b2a0c.en.html)  and the [discussion](http://lists.debconf.org/lurker/message/20140904.031111.11095803.en.html).