Merge branch 'master' of /users/git/public/csc-propaganda
authorTheo Belaire <theo.belaire@gmail.com>
Mon, 9 May 2016 16:33:15 +0000 (12:33 -0400)
committerTheo Belaire <theo.belaire@gmail.com>
Mon, 9 May 2016 16:33:15 +0000 (12:33 -0400)

Trivial merge