[commit: packages/mtl] master: Merge branch 'kantp-master' (6f2ad30)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/mtl

On branch  : master
Link       : http://git.haskell.org/packages/mtl.git/commitdiff/6f2ad3024c3d5e360c44c1ea522534b270c22159

>---------------------------------------------------------------

commit 6f2ad3024c3d5e360c44c1ea522534b270c22159
Merge: af2b156 e1b2542
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Mon Jul 24 16:33:42 2017 -0400

    Merge branch 'kantp-master'



>---------------------------------------------------------------

6f2ad3024c3d5e360c44c1ea522534b270c22159
 CHANGELOG.markdown           | 2 ++
 Control/Monad/State/Class.hs | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)