Added OpenStack Foundation
Added openstack_foundation.png logo
openstack_foundation.png logo was too big and not alpha masked
Merged change done directly on web interface
Merge pull request #695 from extraordinaire/master

[ljubljana 2014] program first draft
Merge pull request #696 from extraordinaire/master

[ljubljana 2014] program finalised
[ljubljana 2014] student discount
Merge pull request #698 from kili/master

Added OpenStack Foundation to sponsors
WP Engine sponsoring Austin
Merge pull request #697 from extraordinaire/patch-1

[ljubljana 2014] student discount
Sumo Logic sponsoring Austin
AppDynamics sponsor for Austin 2014
Shuffling austin sponsors
Internap sponsor for Austin
new sponsor silver puppetlabs for Ams
Merge pull request #699 from drozer/master

new sponsor silver puppetlabs for Ams
typo in index.htm
Merge pull request #700 from drozer/master

typo in index.htm
new sponsor layerthree silver
Merge pull request #701 from drozer/master

new sponsor layerthree silver