Merge pull request #378 from longjon/no-merge-duplicates
authorJeff Donahue <jeff.donahue@gmail.com>
Wed, 30 Apr 2014 19:53:32 +0000 (12:53 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Wed, 30 Apr 2014 19:53:32 +0000 (12:53 -0700)
Note the last added layer/params in caffe.proto to prevent conflicts


Trivial merge