Moved `merge` argument into `**kwargs`.
authordeyk <deyk@crossway.org>
Wed, 11 Apr 2012 21:51:54 +0000 (14:51 -0700)
committerdeyk <deyk@crossway.org>
Wed, 11 Apr 2012 21:51:54 +0000 (14:51 -0700)

No differences found