Merge remote-tracking branch 'remotes/nyergler/issue-653-csrf-exception'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 13 Nov 2011 20:20:16 +0000 (14:20 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 13 Nov 2011 20:20:16 +0000 (14:20 -0600)

Trivial merge