Missing bit of the 2014 copyright update
Merge remote-tracking branch 'frodeaa/add-config-option'
Merge branch 'master' of https://github.com/Schnouki/spop