Merge pull request #3096 from longjon/fix-conv-reshape
authorJon Long <jonlong@cs.berkeley.edu>
Mon, 21 Sep 2015 23:27:51 +0000 (16:27 -0700)
committerJon Long <jonlong@cs.berkeley.edu>
Mon, 21 Sep 2015 23:27:51 +0000 (16:27 -0700)
Fix broken conv/deconv reshaping


Trivial merge