Merge branch 'master' of /users/git/www/www
authorPatrick Melanson <pj2melan@uwaterloo.ca>
Wed, 8 Jul 2015 13:37:47 +0000 (09:37 -0400)
committerPatrick Melanson <pj2melan@uwaterloo.ca>
Wed, 8 Jul 2015 13:37:47 +0000 (09:37 -0400)
1  2 
news.xml

diff --cc news.xml
Simple merge