Merge pull request #1836 from jeffdonahue/loss-param-upgrade-fix
authorJeff Donahue <jeff.donahue@gmail.com>
Fri, 6 Feb 2015 04:05:20 +0000 (20:05 -0800)
committerJeff Donahue <jeff.donahue@gmail.com>
Fri, 6 Feb 2015 04:05:20 +0000 (20:05 -0800)
fix for layer-type-str: loss_param in V1LayerParameter


Trivial merge