Merge remote-tracking branch 'origin/dev-python/dj-search-url'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:52:24 +0000 (11:52 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:52:24 +0000 (11:52 -0700)
commit4ae909e8c0cf1a470097c3395a586b71849b6203
treee467771fc6b98d1bc0665fdb672d607cbf7492ce
parentc7f900ef7d676e8516ea785afe1f4989252caf26
parent227accfd5424864b1eb9dba22fad1020ae1a5625
Merge remote-tracking branch 'origin/dev-python/dj-search-url'

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

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