Merge remote-tracking branch 'origin/dev-python/pytest-django'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:52:25 +0000 (11:52 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:52:25 +0000 (11:52 -0700)
commit52d2e9a10dc0dfe85bf6adbf31f8a976a8a51415
tree282b583222ff2f1082a227fdab049ee40b4a2736
parent598841650f9401b19d6b8aa38d7200a611642d56
parent38cf06afc95da408600dfd355b84faa4b718f478
Merge remote-tracking branch 'origin/dev-python/pytest-django'

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

  $ git merge -s ours --no-commit origin/dev-python/pytest-django
  $ git read-tree --prefix=dev-python/dev-python/pytest-django/ -u origin/dev-python/pytest-django
  $ 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/pytest-django/pytest-django-9999.ebuild