Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Sat, 1 Mar 2014 15:46:58 +0000 (10:46 -0500)
committerCharles Connell <charles@connells.org>
Sat, 1 Mar 2014 15:46:58 +0000 (10:46 -0500)

Trivial merge