Merge remote-tracking branch 'riseup/master' into leap
authorMicah Anderson <micah@riseup.net>
Thu, 13 Jun 2013 00:16:30 +0000 (20:16 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 13 Jun 2013 00:16:30 +0000 (20:16 -0400)

Trivial merge