Merge remote-tracking branch 'origin/dev-python/dj-database-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)
commit605d76c8843f3a393ae56782f352aeb63712e437
tree469c0c4848490b66515f766f29a500657ce5becd
parent088ae79b874ab08ca495145efa4b2f25364d1f66
parent390de985b87485bb28f7e2faf46173b3eee36564
Merge remote-tracking branch 'origin/dev-python/dj-database-url'

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

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