Merge remote-tracking branch 'intrigeri/mirrorlist'
authorJoey Hess <joey@kitenet.net>
Sun, 3 Jun 2012 17:15:19 +0000 (13:15 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 3 Jun 2012 17:15:19 +0000 (13:15 -0400)

Trivial merge