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)
commit32f3b4de00b1d2c4e3bfd7eca63f5ebbd4501ae7
tree03f9973ece80ef3e21c9ef2e4f5b1ae131b28a7b
parent4eeeed1b6ec99d180b556ea7a6a8a30c9657a0fd
parent5b494e1b636f4c26c14c9cf8f964bef0a70c784a
Merge remote-tracking branch 'intrigeri/mirrorlist'