Merge branch 'master' of git.moose.perl.org:moose-website

diff --combined lib/Moose/Website/I18N/po/de.po
index 5444c21,1bb6e44..d5c08f0
--- 1/lib/Moose/Website/I18N/po/de.po
--- 2/lib/Moose/Website/I18N/po/de.po
+++ b/lib/Moose/Website/I18N/po/de.po
@@@ -109,9 -109,6 +109,6 @@@ msgstr "
  msgid "download info Moose"
  msgstr "Die Moose-Hauptdistribution"
  
- msgid "download info <code>Class::MOP</code>"
- msgstr "Das Metaobjektprotokoll, auf welchem Moose aufbaut"
- 
  msgid "download info <code>Task::Moose</code>"
  msgstr "Eine Sammlung hervorragender Erweiterungen für Moose"
  
@@@ -260,7 -257,7 +257,7 @@@ msgstr "Perlmonger-Gruppen
  msgid "footer copyright"
  msgstr ""
  "Copyright © <a href='http://www.iinteractive.com'>Infinity Interactive</a>, "
 -"2006 – 2010"
 +"2006 – 2011"
  
  msgid "footer terms"
  msgstr ""

diff --combined lib/Moose/Website/I18N/po/en.po
index 9dbde35,aa2b26f..c77e70a
--- 1/lib/Moose/Website/I18N/po/en.po
--- 2/lib/Moose/Website/I18N/po/en.po
+++ b/lib/Moose/Website/I18N/po/en.po
@@@ -78,9 -78,6 +78,6 @@@ msgstr "<p>Moose and its related module
  msgid "download info Moose"
  msgstr "The core Moose distribution"
  
- msgid "download info <code>Class::MOP</code>"
- msgstr "The underlying meta object protocol upon which Moose is built"
- 
  msgid "download info <code>Task::Moose</code>"
  msgstr "A collection of excellent Moose extensions"
  
@@@ -186,7 -183,7 +183,7 @@@ msgstr "Perl Mongers Groups
  # footer
  
  msgid "footer copyright"
 -msgstr "Copyright © <a href='http://www.iinteractive.com'>Infinity Interactive</a>, 2006 – 2010"
 +msgstr "Copyright © <a href='http://www.iinteractive.com'>Infinity Interactive</a>, 2006 – 2011"
  
  msgid "footer terms"
  msgstr "This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself."