Merge branch 'master' of /users/git/public/csc-propaganda
authorTheo Belaire <theo.belaire@gmail.com>
Tue, 6 Oct 2015 19:04:14 +0000 (15:04 -0400)
committerTheo Belaire <theo.belaire@gmail.com>
Tue, 6 Oct 2015 19:04:14 +0000 (15:04 -0400)

Trivial merge