From: dol-sen Date: Thu, 14 Jul 2011 01:43:17 +0000 (-0700) Subject: Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into... X-Git-Tag: gentoolkit-0.3.0.5~25 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=040600057ca333a4285e321a08bdf69cc0f11231;p=gentoolkit.git Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into gentoolkit Conflicts: pym/gentoolkit/revdep_rebuild/collect.py pym/gentoolkit/revdep_rebuild/rebuild.py pym/gentoolkit/revdep_rebuild/settings.py pym/gentoolkit/revdep_rebuild/stuff.py --- 040600057ca333a4285e321a08bdf69cc0f11231