Merge branch 'topic/2009-conferences' of gitmo@git.moose.perl.org:moose-website topic/2009-conferences topic/fix-tmbundle-url
Stevan Little [Sat, 24 Oct 2009 20:34:52 +0000 (16:34 -0400)]
1  2 
index.html

diff --cc index.html
Simple merge