Merge remote-tracking branch 'immerda/master'
authorMicah Anderson <micah@riseup.net>
Thu, 24 Mar 2011 15:30:47 +0000 (11:30 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 24 Mar 2011 15:30:47 +0000 (11:30 -0400)

Trivial merge