From: Stevan Little <stevan.little@iinteractive.com>
Date: Wed, 16 Feb 2011 15:50:55 +0000 (-0500)
Subject: Merge branch 'master' of git.moose.perl.org:moose-website
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2Fmoose-website.git;a=commitdiff_plain;h=6ebc8d3048b2d3a5f3b59fb06edb3e7d32473952

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

6ebc8d3048b2d3a5f3b59fb06edb3e7d32473952
diff --cc data/pages.yml
index ba611f3,3c97427..0483471
--- a/data/pages.yml
+++ b/data/pages.yml
@@@ -397,12 -383,8 +397,12 @@@
      - year          : 2010
        presentations :
          - title :
 +            en  : Ynon Perek's Perl Object Oriented Programming slides
 +            de  : Ynon Perek's Perl Object Oriented Programming slides
 +          url   : http://prezi.com/fgdoyw0smyqo/perl-object-oriented-programming/
 +        - title :
              en : Stevan Little's keynote at <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
-             de : Vortrag von Stevan Little beim <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
+             de : Vortrag von Stevan Little auf der <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
            url   : http://www.iinteractive.com/yapc/slides.html
            video : http://www.presentingperl.org/yn2010/modern-perl/
          - title :