commit 1dbf49ca29e1687d2b16959df3ff905ab464ddf4
Merge: 24afcc9 ddb4116
Author: Filipe <ocefpaf@gmail.com>
Date:   Thu Nov 21 11:47:48 2019 -0300

    Rebuild for python38 (#57)
    
    Rebuild for python38

commit ddb41167471cece318c02ad460db99901bd83432
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 21 11:35:54 2019 -0300

    MNT: Re-rendered with conda-build 3.18.11, conda-smithy 3.6.2, and conda-forge-pinning 2019.11.20

commit 4618523cfd206f7198088ca446b2061f36fc6bb2
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 21 11:35:48 2019 -0300

    fix recipe

commit 32fca37652068e0fccfa6f1354ae078fc2e5e01d
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Fri Nov 8 17:24:41 2019 +0000

    MNT: Re-rendered with conda-build 3.18.11, conda-smithy 3.6.2, and conda-forge-pinning 2019.11.01

commit f8d1b6f6ee77e16a539de5a17d6266eff1221750
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Fri Nov 8 17:24:19 2019 +0000

    bump build number

commit 24afcc901b8b6bab73244d7c5beb7001fa445e5e
Merge: 957cdad c1c89c9
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Fri Nov 8 16:57:45 2019 +0100

    Merge pull request #56 from regro-cf-autotick-bot/18.4.0
    
    cherrypy v18.4.0

commit c1c89c95e89c852310f8388db574b877fb91163e
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Fri Nov 8 15:47:43 2019 +0000

    MNT: Re-rendered with conda-build 3.18.11, conda-smithy 3.6.2, and conda-forge-pinning 2019.11.01

commit bf7dc85f0b4be154c95233d0efccac3129f1d1e0
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Thu Nov 7 18:26:56 2019 +0100

    update deps

commit b7bf1f413a22aed3b97dd9b0ce91a27cb5e335ee
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Nov 6 02:21:07 2019 +0000

    updated v18.4.0

commit 957cdadfe8db7a1b8e0db1e9c07eb809e29daebf
Merge: e11d218 4365d0a
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Tue Nov 5 22:56:43 2019 +0100

    Merge pull request #53 from regro-cf-autotick-bot/18.3.0
    
    cherrypy v18.3.0

commit 4365d0af22b69a5fdeb7bcaf5c11ac24fa6dbe46
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Fri Oct 11 21:40:11 2019 +0200

    update install script

commit fdc36c6c05c7a2ae1f876b7e9563c62dc8a89443
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Thu Oct 3 00:16:56 2019 +0000

    MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.5.0, and conda-forge-pinning 2019.10.01

commit 7636f54f2dae6bd4ab22133a655163fca0ac0121
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Thu Oct 3 00:16:28 2019 +0000

    updated v18.3.0

commit e11d2189a67ab2b0917307610045e7bfceb1540f
Merge: 689f4a4 8dc48fd
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Wed Sep 11 11:35:56 2019 +0200

    Merge pull request #52 from regro-cf-autotick-bot/18.2.0
    
    cherrypy v18.2.0

commit 689f4a422e260ae84f11555ffcc4412ab33d45be
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Fri Sep 6 18:37:11 2019 -0500

    [ci skip] ***NO_CI*** Move from appveyor to azure.
    
    See https://github.com/conda-forge/conda-forge.github.io/issues/857

commit 8dc48fd941de79ab1c29067444749d200b61dac4
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Sep 4 02:39:25 2019 +0000

    MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.08.27

commit c95d66a8d3afcd165a81fb00bf7bcb570b2d0b07
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Sep 4 02:39:00 2019 +0000

    updated v18.2.0

commit 82423d6b8149db6ff7041e643b8803b87c901aba
Merge: 88fde74 721b373
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Wed Jul 10 17:28:53 2019 +0200

    Merge pull request #51 from regro-cf-autotick-bot/18.1.2
    
    cherrypy v18.1.2

commit 721b37362cb489366e1cbaab50e4011aee3ed1b2
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Wed Jul 10 17:15:29 2019 +0200

    remove six dependency

commit 473307c9e53fee1ab77c85968541eae55fa85185
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Jun 23 16:32:44 2019 +0000

    MNT: Re-rendered with conda-build 3.18.4, conda-smithy 3.3.7, and conda-forge-pinning 2019.06.19

commit b73ac19a39390d08eace5276e6afa8116ad32fac
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Jun 23 16:32:22 2019 +0000

    updated v18.1.2

commit 88fde747098335c066ed611a9b8c610bd7318863
Merge: 0fadca7 5aa7219
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Fri May 17 23:04:50 2019 -0400

    Merge pull request #50 from regro-cf-autotick-bot/18.1.1
    
    cherrypy v18.1.1

commit 5aa7219413c15e56fd178aa57f2dd7eb3b8e522f
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Wed Mar 27 18:06:40 2019 +0100

    simplify recipe

commit e30a4e0f9ea50506d4405bde8b50ef93ee98e0f7
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Wed Mar 27 18:04:00 2019 +0100

    contextlib2 is no more needed

commit d5d3a7d3f8366188d1d225881de9af7b7894f49a
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Mar 27 15:40:42 2019 +0000

    MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.2, and conda-forge-pinning 2019.03.17

commit 33ae30707518b863dd1189c85825514b1c8e64e6
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Mar 27 15:40:29 2019 +0000

    updated v18.1.1

commit 0fadca782111e7b710b87d663fb2b69bda8c8ada
Merge: 1b66a14 c94084c
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Mon Dec 10 09:19:19 2018 +0100

    Merge pull request #49 from regro-cf-autotick-bot/18.1.0
    
    cherrypy v18.1.0

commit c94084cfd523513e29c40f74594ddac4a07488fa
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Dec 9 18:12:30 2018 +0000

    updated v18.1.0

commit 1b66a146f8e2b43871590602ac77cb6053d17ebd
Merge: 462d81d 2dd538a
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Tue Oct 9 20:29:34 2018 -0400

    Merge pull request #48 from regro-cf-autotick-bot/rebuild
    
    Rebuild for Python 3.7, GCC 7, R 3.5.1, openBLAS 0.3.2

commit 2dd538a08ddccde4600665d0635111d317d3da8f
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Tue Oct 9 17:06:18 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.08

commit 9834b7a2031a5df184f72f6b915b0e5f9a2ba551
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Tue Oct 9 17:06:13 2018 +0000

    bump build number

commit 462d81df9f3120ebf749da9292e912f92d83007d
Merge: 7b159a8 162791c
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Tue Sep 18 21:13:58 2018 +0200

    Merge pull request #47 from regro-cf-autotick-bot/18.0.1
    
    cherrypy v18.0.1

commit 162791c0e5b7a951abed716ce3f78fc7c1d50a65
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue Sep 18 15:38:18 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.17

commit 203b239ac731e62715665d5ec50c783fcfed030b
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Sep 9 14:09:21 2018 +0000

    updated v18.0.1

commit 7b159a8d08f8f41388743d2974e707815eaff211
Merge: f49b630 b7a2a00
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sun Sep 2 23:42:32 2018 +0200

    Merge pull request #46 from regro-cf-autotick-bot/18.0.0
    
    cherrypy v18.0.0

commit b7a2a00239a3e6c631c70eab8be42d3cdfc733dc
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sun Sep 2 12:07:49 2018 +0200

    drop py27 and py34 support

commit 4004f110cb443e027780ad0ce98a02a81c6bdc43
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Sep 2 00:12:09 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.08.31

commit 26eaf3ee30633defdd09e45557166d3eb6f35b1f
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Sep 2 00:11:48 2018 +0000

    updated v18.0.0

commit f49b6307fad8422ff2df8f9945080122009b71bb
Merge: 029f138 101b70e
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Tue Aug 28 16:51:22 2018 +0200

    Merge pull request #45 from carlodri/add-win-console-support
    
    add windows console events support

commit 101b70edcee4a71c473cc2d71ee382a8f2f3e53e
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Oct 9 17:12:40 2017 -0500

    Update about section

commit 2d4074de95161e84bd0c6e1cb8d1d3f930c934c3
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Aug 25 19:42:09 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.08.21

commit bee9576c4a266bd8e4edbb874db7aeb93c97af66
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Aug 25 21:40:45 2018 +0200

    remove noarch

commit 720bfc9802a741d5ae18dcf199a0e538d00325f1
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Aug 25 21:38:03 2018 +0200

    add pywin32 win requirement

commit 029f1384d7732affd41e3f1377ddb628ca365976
Merge: 9b2406f d4b56ec
Author: Filipe <ocefpaf@gmail.com>
Date:   Wed Aug 22 05:57:13 2018 -0700

    Merge pull request #44 from carlodri/bump_v17.3.0
    
    bump to v17.3.0

commit d4b56ec4478b0a98cfe4680459d5b42713f25db9
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Mon Aug 20 05:26:01 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.08.14

commit 7f9011acaa0631e8e3718cdf41aa8b73409f8fa6
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Aug 18 21:47:24 2018 +0200

    bump version, fix deps, update recipe

commit 9b2406f75987d6884958108e79cb5e9563393f2d
Author: Travis CI User <travis@example.org>
Date:   Sat Aug 4 17:15:46 2018 +0000

    [ci skip] [skip ci] Update anaconda token

commit abe80bffc5e7cfbe1a5ba4ac2967139f275a25c3
Merge: ec4f1db 75ebb5c
Author: Filipe <ocefpaf@gmail.com>
Date:   Tue Jul 24 11:35:57 2018 -0300

    Merge pull request #38 from regro-cf-autotick-bot/17.0.0
    
    cherrypy v17.0.0

commit 75ebb5c3acf4cf4610de23b4e4e7df54d2a3ac13
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Fri Jul 13 17:11:20 2018 +0000

    updated v17.0.0

commit ec4f1dbb3b01fe1cf40a3fb858451b62b246e00a
Merge: 27bdfbd 88a56ff
Author: Peter M. Landwehr <plandweh@andrew.cmu.edu>
Date:   Sat May 19 12:35:09 2018 -0700

    Merge pull request #34 from regro-cf-autotick-bot/15.0.0
    
    cherrypy v15.0.0

commit 88a56ffdbb1f5e417980ec061663a2e94ed06f2d
Author: Travis CI User <travis@example.org>
Date:   Fri May 11 23:04:16 2018 +0000

    updated v15.0.0

commit 27bdfbdee72a723147b7f04561b5788a6622e714
Merge: a2a4c17 6460f60
Author: Peter M. Landwehr <plandweh@andrew.cmu.edu>
Date:   Mon Apr 23 09:33:43 2018 -0700

    Merge pull request #33 from regro-cf-autotick-bot/14.2.0
    
    cherrypy v14.2.0

commit 6460f607dceac4a690e5d304986bdf69712a02af
Author: Travis CI User <travis@example.org>
Date:   Sun Apr 22 17:15:58 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.2 and pinning 2018.04.19

commit f1216309b29ec4d698bbd01a08ee90fddb407c9b
Author: Travis CI User <travis@example.org>
Date:   Sun Apr 22 17:14:40 2018 +0000

    updated v14.2.0

commit a2a4c1766d49ac40034fcd5aa8f93821c0fb0661
Merge: ecc9403 fb538e6
Author: Peter M. Landwehr <plandweh@andrew.cmu.edu>
Date:   Fri Apr 20 21:57:34 2018 -0700

    Merge pull request #32 from regro-cf-autotick-bot/14.1.0
    
    cherrypy v14.1.0

commit fb538e6edb49452d8bed0a385990fae3f58fc0a2
Author: Peter M. Landwehr <plandweh@andrew.cmu.edu>
Date:   Fri Apr 20 21:38:44 2018 -0700

    pypi.org, jinja, run reqs

commit c20e47648d98684826a6ce6b31abbbdb0acc0044
Author: Travis CI User <travis@example.org>
Date:   Thu Apr 19 04:06:31 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.1 and pinning 2018.04.18

commit 8d4274a5e74b95723a2ed0704c503469d5c4ba44
Author: Travis CI User <travis@example.org>
Date:   Thu Apr 19 04:06:07 2018 +0000

    updated v14.1.0

commit ecc940372a4ccc670dba554bdf139e69b075a30d
Merge: ee22f10 3738350
Author: Filipe <ocefpaf@gmail.com>
Date:   Mon Feb 12 15:32:42 2018 -0200

    Merge pull request #29 from ocefpaf/update_to_14.0.0
    
    update to 14.0.0

commit 3738350a4b788cf4cb722c30667ce55523f96c1f
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Mon Feb 12 09:24:20 2018 -0800

    update to 14.0.0

commit ee22f10405077ab2285b2cc0cdc2497e2a429d53
Merge: c406417 708a869
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Mon Nov 6 23:21:46 2017 -0800

    Merge pull request #26 from pmlandwehr/master
    
    Ticked version, regenerated if needed. (Double-check reqs!)

commit 708a8692a13adcc96e88bf6ba785dc525d521736
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Mon Nov 6 23:08:28 2017 -0800

    Update run reqs

commit 1293697b39982864d62a3f06db4144f9591621b5
Author: pmlandwehr <None>
Date:   Mon Nov 6 22:34:58 2017 -0800

    MNT: Updated the feedstock for conda-smithy version 2.4.2.

commit 5ce40aa6dfc81b208a63dd3f00fdefb85a4c912e
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Mon Nov 6 22:32:34 2017 -0800

    Tick version to 11.1.0

commit c406417a2312e7e7eb91f07a753c04b3e03e2ec7
Merge: 55bd603 df278cd
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Sun Sep 10 23:19:18 2017 -0700

    Merge pull request #25 from pmlandwehr/master
    
    Ticked version, regenerated if needed. (Double-check reqs!)

commit df278cd8318138e554f1926e851c333d9ad78ef9
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Sun Sep 10 23:10:07 2017 -0700

    Add entry_point for cherryd

commit 1a5d94a0117fabda855620457b712a40609d2bdc
Author: Peter <pmlandwehr@gmail.com>
Date:   Sun Sep 10 23:03:18 2017 -0700

    MNT: Re-rendered with conda-smithy 2.4.0

commit fa534666cb8e5d945b073b091cf2d5ea95a2dea5
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Sun Sep 10 23:02:40 2017 -0700

    Skip win32, add noarch: python

commit feb50aa94b372826c068e4267d4ac879c740a4f0
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Wed Aug 30 21:22:38 2017 -0700

    Added setuptools to run reqs

commit fead2daf8fd645ee4ae4de7e22125e3e217ac17e
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Tue Aug 29 23:40:59 2017 -0700

    Updated tests

commit 1581618473393f3bbd5f6c4719ef6c86d6349efc
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Sun Aug 27 00:00:31 2017 -0700

    Update license location

commit e5faa4a25de1b950b3b23603c6fb9dd6e4664bd7
Author: Peter <pmlandwehr@gmail.com>
Date:   Sat Aug 26 22:54:30 2017 -0700

    MNT: Re-rendered with conda-smithy 2.3.3

commit 7f6666740f5d5be11972a27768e0ee2e1eb35dec
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Sat Aug 26 22:53:07 2017 -0700

    Update build and run reqs

commit f6edc2cc555572f834b4f312c2028c31a593e749
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Sat Aug 26 21:03:44 2017 -0700

    Tick version to 11.0.0

commit 55bd603211c5b32443603ffcd50d87dcc0d36f17
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 19:48:27 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit c5d095f02861428524e2a47e8df093ec45427f69
Merge: 914da83 bd1e471
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Wed May 3 15:09:55 2017 -0700

    Merge pull request #11 from pmlandwehr/master
    
    Update template, regenerate

commit bd1e471ba9c64f88feac3147a5c3a9d9fe5c6fe6
Author: Pete[r] M. Landwehr <pmlandwehr@gmail.com>
Date:   Wed May 3 12:10:28 2017 -0700

    MNT: Re-rendered with conda-smithy 2.3.0

commit 527611648d7e2a39c661f8f279eba4a19788a5bc
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Wed May 3 12:08:50 2017 -0700

    fix jinja

commit f61e87424bdcb137672ab9df53bbd9ca673e0cfd
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Wed May 3 12:08:16 2017 -0700

    Update template

commit 914da8308cb433bf355ef371df0f6663dba328aa
Author: Peter Landwehr <pmlandwehr@gmail.com>
Date:   Fri Mar 17 22:33:28 2017 -0700

    MNT: Re-rendered with conda-smithy 2.1.1

commit 41f1c3ae5e6627d170cbf57e52cc60b660700224
Merge: a267f93 01fa287
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Mon Feb 6 00:46:23 2017 -0800

    Merge pull request #7 from pmlandwehr/master
    
    Tick build to 8.0.0, fix template, regenerate

commit 01fa287b255497b8ee52ecf48d7034db30106ef4
Author: Peter Landwehr <pmlandwehr@gmail.com>
Date:   Tue Jan 31 17:12:17 2017 -0800

    MNT: Re-rendered with conda-smithy 2.0.1

commit 03730f33e303057218325d7ba977fb996f5a3ec7
Author: Peter Landwehr <pmlandwehr@gmail.com>
Date:   Tue Jan 31 17:11:35 2017 -0800

    Tick build to 8.0.0, fix template

commit a267f93fa9ed3fe5437f894ad64afd1692d056ab
Merge: 7613f0a ac4d412
Author: jakirkham <jakirkham@gmail.com>
Date:   Fri Dec 30 17:59:59 2016 -0500

    Merge pull request #6 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock [ci skip]

commit ac4d41229469e1422d9c30da06786d38b3b9dfa0
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Fri Dec 30 01:35:05 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 1.7.0.

commit 7613f0a0bb55ba2be4ee38bf82af7af19e548ed5
Merge: 105b327 751012d
Author: Pete[r] M. Landwehr <pmlandwehr@gmail.com>
Date:   Mon Aug 29 16:48:57 2016 -0700

    Merge branch 'pmlandwehr-master'

commit 751012d8b0b8dc9b38981290c42e199d1499e883
Merge: 105b327 d596589
Author: Pete[r] M. Landwehr <pmlandwehr@gmail.com>
Date:   Mon Aug 29 16:48:32 2016 -0700

    Merge branch 'master' of https://github.com/pmlandwehr/cherrypy-feedstock into pmlandwehr-master
    
    # Conflicts:
    #       recipe/meta.yaml

commit d596589e5c435888268d90fa407b009658f7098f
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Mon Aug 29 16:22:35 2016 -0700

    version -> 7.1.0, new license info

commit 105b327d65ec33a2956a256f24f73c3f412f4f89
Merge: a0beb5e a9c04fe
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Mon Jul 18 15:54:56 2016 -0700

    Merge pull request #4 from RSully/bump-6.1.1
    
    Bump to 6.1.1

commit a9c04fe135da73699a4925abc55640f70886e25a
Author: Ryan <ryan@axiomdatascience.com>
Date:   Mon Jul 18 16:14:24 2016 -0400

    Bump to 6.1.1

commit a0beb5e75ddcef3bd19fc8104b5bd8da71b8be9c
Merge: 3824932 3ae2c18
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Fri Jul 8 00:21:33 2016 -0400

    Merge pull request #3 from pmlandwehr/master
    
    6.0.1 -> 3.8.2

commit 382493216cdf5bc4a126c9f3039dfe11d1d7fea7
Merge: 1055982 cbd9bf7
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Fri Jul 8 00:20:23 2016 -0400

    Merge pull request #2 from jakirkham/re_render_conda_config_workaround
    
    Re-render with a conda config workaround

commit 3ae2c18f8c7197cf44204d857492b3e816625eee
Author: Peter M. Landwehr <plandweh@cs.cmu.edu>
Date:   Fri Jul 8 00:05:02 2016 -0400

    6.0.1 -> 3.8.2
    
    Rollback for tangelo build; see [here](https://github.com/conda-forge/staged-recipes/pull/905)

commit cbd9bf7b36071eb241da48f8e921928c3dd4bbe4
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Jun 16 00:43:21 2016 -0400

    Re-render with a conda config workaround.

commit 105598284a2f68af87692f10f4324f9468f00158
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Thu Jun 16 04:25:23 2016 +0000

    Re-render the feedstock after CI registration.

commit 47de9aa8be073ac67868b2e3b2ccd11e6c412e41
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Thu Jun 16 04:24:12 2016 +0000

    Initial commit of the cherrypy feedstock.
