Merge remote-tracking branch 'upstream/master'
authorMicah Anderson <micah@riseup.net>
Sun, 26 May 2013 20:19:56 +0000 (16:19 -0400)
committerMicah Anderson <micah@riseup.net>
Sun, 26 May 2013 20:19:56 +0000 (16:19 -0400)

Trivial merge