Merge remote-tracking branch 'refs/remotes/spaetz/trac_475_email_notification_checkbox'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 13 Nov 2012 14:55:14 +0000 (08:55 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 13 Nov 2012 14:55:14 +0000 (08:55 -0600)

Trivial merge