Merge pull request #5539 from shelhamer/caffe-1.0
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 15 Apr 2017 00:12:02 +0000 (17:12 -0700)
committerGitHub <noreply@github.com>
Sat, 15 Apr 2017 00:12:02 +0000 (17:12 -0700)
Caffe 1.0


Trivial merge