Merge remote-tracking branch 'origin/dev-python/thumbor'
authorW. Trevor King <wking@tremily.us>
Thu, 23 Oct 2014 23:24:13 +0000 (16:24 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 23 Oct 2014 23:24:13 +0000 (16:24 -0700)
commit2f43d9b50c763c049d6ffb32e19177670d99de59
tree19ba77a3032c44c0b9b412d789fcb2ae039e6b70
parente1ebc0bc4cec0670b9ed41f9d94d9389a89810c2
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