Merge remote-tracking branch 'origin/dev-python/django-cache-url'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:47:27 +0000 (11:47 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:47:27 +0000 (11:47 -0700)
commit088ae79b874ab08ca495145efa4b2f25364d1f66
tree1ec753eeb9f97a63760273ddff7094acf1e9f83b
parent9744bea5e22dc9fbb91d60871b242484a0d7a829
parent301b296f90f270c5fcc152e74409e785e1723b11
Merge remote-tracking branch 'origin/dev-python/django-cache-url'

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

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