Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 20 Oct 2011 17:08:12 +0000 (19:08 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 20 Oct 2011 17:08:12 +0000 (19:08 +0200)
1  2 
bin/repoman

diff --cc bin/repoman
Simple merge