added DebConf14
Merge remote-tracking branch 'refs/remotes/joeyh/master'