commit d1b3baab6568f0778ef903ea0ac11fccaf3d2080
Merge: 1db8b1f 2bf4a82
Author: Vlad Frolov <frolvlad@gmail.com>
Date:   Tue Jan 16 22:23:02 2018 +0200

    Merge pull request #13 from igortg/patch-1
    
    Update marshmallow to 2.15.0

commit 2bf4a8202f10959a9c7c512a24543c94935bba7d
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue Jan 16 20:07:04 2018 +0000

    MNT: Re-rendered with conda-smithy 2.4.5

commit 3e3b3d9d8d080735bc232bea7bd22de7c8df9805
Author: Igor T. Ghisi <igor.ghisi@gmail.com>
Date:   Tue Jan 16 14:29:13 2018 -0200

    Fix sha256

commit 367f89674a197fa75042c293d6112391e01adbae
Author: Igor T. Ghisi <igor.ghisi@gmail.com>
Date:   Tue Jan 16 14:12:33 2018 -0200

    Update marshmallow to 2.15.0

commit 1db8b1fd20a03a94a59aa79709c85ebeb892fb6a
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 21:41:49 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit 67fed0bf6ce60940449e913895e39c4c26f4b32a
Merge: c9357a8 ef5b1cf
Author: Vlad Frolov <frolvlad@gmail.com>
Date:   Sat Jul 29 08:01:04 2017 +0300

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

commit ef5b1cf3670a8d9cedb8f229ed750064b64b51fa
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Jul 29 01:50:54 2017 +0000

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

commit c9357a8c4a5a3acc3e670bbd5b06935671a6addc
Merge: 54a05a6 88ed135
Author: Vlad Frolov <frolvlad@gmail.com>
Date:   Mon May 22 18:51:38 2017 +0300

    Merge pull request #11 from mcs07/master
    
    Update to 2.13.5

commit 88ed135ce405b0c908a6a8080b5b5b2c3037186e
Author: Matt Swain <m.swain@vernalis.com>
Date:   Mon May 22 15:47:03 2017 +0100

    Update to 2.13.5

commit 54a05a695d756a3a24cb2357f4feeedae72d0387
Merge: 0f36897 63cc546
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Sun Mar 5 06:19:24 2017 -0500

    Merge pull request #10 from frol/release-2.13.1
    
    Update to 2.13.1

commit 63cc5460a160d2a2a7de1967169c769e5b659829
Author: Vlad Frolov <frolvlad@gmail.com>
Date:   Sat Mar 4 22:06:34 2017 +0200

    Update to 2.13.1

commit 0f36897dd44f0a18263849725766a74f01aa3dd4
Merge: e989cad 216dcd9
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Mon Feb 27 07:29:25 2017 -0500

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

commit 216dcd9ff86590904c265a66195ab8a9c5f05241
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Mon Feb 27 01:39:57 2017 +0000

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

commit e989cadca45bb2bfa96c771da568b06c9bd1d87b
Merge: 9df6878 0c35afc
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Tue Feb 7 08:57:22 2017 -0500

    Merge pull request #8 from rth/version-bump
    
    Version bump to 2.12.2

commit 0c35afc50a9a0def4714d7584a6786314fa5d315
Author: Roman Yurchak <rth.yurchak@gmail.com>
Date:   Mon Feb 6 17:16:47 2017 +0100

    Addressed review comments

commit a3ef8aa9f005f9cddaa467c6274393f1226dc023
Author: Roman Yurchak <rth.yurchak@gmail.com>
Date:   Sun Feb 5 20:22:30 2017 +0100

    MNT: Re-rendered with conda-smithy 2.0.1

commit 43cde131181beb46616e4b0905c615caf82084fd
Author: Roman Yurchak <rth.yurchak@gmail.com>
Date:   Sun Feb 5 12:51:57 2017 +0100

    Don't increment build number

commit 8052d738c075d702e9d3662475ab7c2a2d9b4145
Author: Roman Yurchak <rth.yurchak@gmail.com>
Date:   Sun Feb 5 11:47:27 2017 +0100

    Version bump to 2.12.2

commit 9df687817af2c6193f913e8a6afaf869f3eb5eed
Merge: 8f0a667 472de33
Author: jakirkham <jakirkham@gmail.com>
Date:   Sun Jan 15 03:58:31 2017 -0500

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

commit 472de33168c321aad22032254c2f9ed615637c31
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Thu Jan 12 01:35:44 2017 +0000

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

commit 8f0a667a6bc5f5ae5caa70d3e5a5e7954a66b9e0
Merge: c5f9090 3f7ed89
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Tue Dec 6 07:19:29 2016 -0500

    Merge pull request #5 from hajapy/2.10.4_1
    
    bump build number

commit 3f7ed89f31db646dd919a439fe7b0d3bb3460fdd
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Mon Dec 5 21:37:21 2016 -0500

    bump build number

commit c5f909071ddfa3f9a6aeba3fcb0ae9ebd6bac2f7
Merge: 338f27b 4e2ddf5
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Sun Dec 4 08:25:33 2016 -0500

    Merge pull request #4 from hajapy/2.10.4
    
    bump version to 2.10.4

commit 4e2ddf5fcc193d60bf28ed577f9343c4462f44fd
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Sat Dec 3 17:26:59 2016 -0500

    bump version to 2.10.4

commit 338f27be0de841900dfd802c74c7244884720989
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Sun Dec 4 07:58:56 2016 -0500

    MNT: Re-rendered with conda-smithy 1.6.0

commit 84a72edaed9a37780d27f8a5f4270e49b3aa4048
Merge: d637732 fe30318
Author: jakirkham <jakirkham@gmail.com>
Date:   Mon Oct 17 09:53:31 2016 -0400

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

commit fe30318ff83b27523acd68f9ab0da2c41920cf7b
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Mon Oct 17 01:38:07 2016 +0000

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

commit d63773295836bc69cafd416465b8ddc3a34de446
Merge: b6ad8fe 5d884e0
Author: hajapy <hajapy@users.noreply.github.com>
Date:   Fri Sep 23 10:34:24 2016 -0400

    Merge pull request #1 from hajapy/2.10.1
    
    bump version to 2.10.1

commit 5d884e04289b83e895b84f1c4c946ff4ce4f2f21
Author: aachkar-miovision <aachkar@miovision.com>
Date:   Fri Sep 23 10:23:06 2016 -0400

    bump version to 2.10.1

commit b6ad8fed51222d0266c5c2832ee006d9f874a0f9
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Tue Sep 13 12:04:19 2016 +0000

    Re-render the feedstock after CI registration.

commit 0192c3bdfee5e4645cbee50b7d0f876485d9867b
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Tue Sep 13 12:02:37 2016 +0000

    Initial commit of the marshmallow feedstock.
