Merge remote branch 'upstream/master'

DFectuoso · Dec 21, 2009 · e5aa676 · e5aa676
2 parents 0e212ab + 4fdbde4
commit e5aa676
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/views/index.erb b/views/index.erb
@@ -35,7 +35,7 @@
     &lt;script type="text/javascript" src="http://timeapi.org/utc/now.json?callback=myCallback"&gt;&lt;/script&gt;
   </pre>
 	<p>
-		by <a href="http://zh.soup.io/">Stoyan Zhekov</a>, <a href="http://chipt.com/">Matt Pennig</a>, and <a href="http://progrium.com">Jeff Lindsay</a>. <a href="http://github.com/progrium/timeapi/tree/master">Source code</a> is on GitHub. Hosted on <a href="http://heroku.com/">Heroku</a>.
+		A <a href="http://gliderlab.pbworks.com/TimeApi">GliderLab Collaboration</a>. <a href="http://github.com/progrium/timeapi/tree/master">Source code</a> is on GitHub. Hosted on <a href="http://heroku.com/">Heroku</a>.
 	</p>
 	<script type="text/javascript">
   var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");