Add initial work on conference page
add first text to conference page
add more stuff to the conf page
fix little mistake in hashtag
Merge branch 'master' of github.com:owncloud/www into conference
update text to better reflect the agreement
Update install instructions to use strings.php variables
Merge branch 'master' of github.com:owncloud/www
Update install instructions, install page, and strings.php
Tidy contributor page
Change PGP to GPG. Add link to GPG key on install page
Even out the homepage footer columns
Again tweak homepage columns
Show placeholder image if contribook image not found
Update change log styles, and links by hand (not fun!)
Add links to advisories and hall of fame on security page
Add new advisories and add timestamp
Revert "Add new advisories and add timestamp"

This reverts commit a42ee348e6291b3b7b4967f97ac17dbefed31989.
Add 2 new advisories for 2012
Merge branch 'master' into conference