Merge remote-tracking branch 'origin/dev-python/aiohttp'
authorW. Trevor King <wking@tremily.us>
Wed, 1 Oct 2014 11:58:07 +0000 (04:58 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 1 Oct 2014 11:58:07 +0000 (04:58 -0700)
commit0e6090dbb46c054543ff92df9e86c283b8c7fd21
tree29aa3634ca47c402a9451cad28c8551b80a082af
parent6fb00ae8e483070b0a5ecc4fe8ee26d933fcc6cd
parent825ca85a36c7549eaef1b55cd7fd4e1014a6b479
Merge remote-tracking branch 'origin/dev-python/aiohttp'

Pull in this per-package branch with a subtree merge [1]:

  $ git merge -s ours --no-commit origin/dev-python/aiohttp
  $ git read-tree --prefix=dev-python/aiohttp/ -u origin/dev-python/aiohttp
  $ git commit -v

so folks who aren't using a version of Layman that supports submodules
(currently everybody) can use this modular package.

[1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
dev-python/aiohttp/aiohttp-9999.ebuild