Merge pull request #5136 from pfollmann/fix_batchnorm_layer
authorJeff Donahue <jeff.donahue@gmail.com>
Thu, 13 Apr 2017 20:32:28 +0000 (13:32 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Thu, 13 Apr 2017 20:32:28 +0000 (13:32 -0700)

Trivial merge