.htaccess
Merge branch 'master' of github.com:mhielscher/web-home
Merge branch 'master' of github.com:mhielscher/web-home
Merge remote-tracking branch 'origin/master'
Changed canonical host from www.wasabiflux.org to wasabiflux.org.
Updated PGP key.