Merge remote-tracking branch 'origin/dev-python/thumbor'
authorW. Trevor King <wking@tremily.us>
Thu, 23 Oct 2014 22:49:48 +0000 (15:49 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 23 Oct 2014 22:49:48 +0000 (15:49 -0700)
commit14c8e6b8b6457967dc28549b2216ed42b540b5c8
tree6f5bfe8d168215de425acdede38599a9b8ca9864
parent20ad29d90cbb94b2e2f07af654d316f16f60db38
parent9cd2b9f38587e0aec8c193e8d83eeb575e0fab5e
Merge remote-tracking branch 'origin/dev-python/thumbor'

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

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