Merge remote-tracking branch 'origin/dev-python/django-configurations'
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)
commit598841650f9401b19d6b8aa38d7200a611642d56
treea6ba2d94cecc9b386369a4fb80a7bbbf0200e0fa
parent4ae909e8c0cf1a470097c3395a586b71849b6203
parent399d136117b55568ebb96f50bd4f0106dceafed3
Merge remote-tracking branch 'origin/dev-python/django-configurations'

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

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