Merge remote-tracking branch 'origin/dev-python/dj-email-url'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:47:28 +0000 (11:47 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:47:28 +0000 (11:47 -0700)
commitc7f900ef7d676e8516ea785afe1f4989252caf26
treedb26d2f3c0d9a3fe081221affa417ddd72687a3d
parent605d76c8843f3a393ae56782f352aeb63712e437
parent9e4f2f5b0b4df8ab2ac0d6f637f8182710d39839
Merge remote-tracking branch 'origin/dev-python/dj-email-url'

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

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