Merge branch 'master' into prod

Author: ramsey

css/style.css

@@ -160,6 +160,10 @@ div#container.sub div#intro {
     line-height: 20px;
 }
 
+div#intro p {
+    margin-bottom: 20px;
+}
+
 div#container.sub div#body {
     padding-left: 390px;
     font-family: Arial, sans-serif;

resources/sponsorships.html

@@ -22,7 +22,7 @@ <h1>PHP Community
             <div id="intro"> 
                 <h2>Sponsorship Prospectus</h2>
                 <p>Instead of just collecting money in exchange for ad space, we want to take the opportunity to get to know our sponsors. We figure that this is our chance to create partnerships with people who believe in our mission, so raising the PHP community's awareness of our sponsors should be just be the beginning. Ultimately, it's our goal to find creative ways to help each other and enrich the conference experience for our attendees. This said, speaking opportunities at the conference will be evaluated independently of sponsorships or other considerations (<em>speaking slots are not for sale</em>).</p> 
-		<p> To become a sponsor, please email us at <a href="mailto:[email protected]">[email protected]</a>.</p> 
+                <p>To sponsor us, please send email to <a href="mailto:[email protected]">[email protected]</a>.</p> 
             </div>
             <div id="body">
                 <h3>Platinum Sponsorship: $10,000.00</h3> 

templates/page.php

@@ -13,7 +13,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
         <link href="webfontkit/stylesheet.css" rel="stylesheet" type="text/css">
-        <link href="css/style.css" rel="stylesheet" type="text/css">
+        <link href="css/style.css?r=20110125-1" rel="stylesheet" type="text/css">
         <!-- Grab latest version of jQuery -->
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js">
         </script>