Merge remote-tracking branch 'refs/remotes/tilly-q/variable-front-page'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jan 2014 18:03:07 +0000 (12:03 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jan 2014 18:03:07 +0000 (12:03 -0600)

Trivial merge