Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
authorJennifer Yeelam Wong <jy2wong@caffeine.csclub.uwaterloo.ca>
Wed, 16 Mar 2011 20:10:08 +0000 (16:10 -0400)
committerJennifer Yeelam Wong <jy2wong@caffeine.csclub.uwaterloo.ca>
Wed, 16 Mar 2011 20:10:08 +0000 (16:10 -0400)
Conflicts:
events.xml

1  2 
events.xml

diff --cc events.xml
  </abstract>
  
  </eventitem>
++<<<<<<< HEAD
++=======
++>>>>>>> f176137835745620bb6a3bc79175de9c375bbc30
  <eventitem date="2011-02-17" time="07:00 PM" room="MC2017" title="A Smorgasbord of Perl Talks">
    
      <short><p><i>by KW Perl Mongers</i>. These talks are intended for programmers who are curious about the Swiss Army Chainsaw of languages, Perl.</p></short>