Merge pull request #1694 from jeffdonahue/layer-type-str
authorJeff Donahue <jeff.donahue@gmail.com>
Fri, 6 Feb 2015 00:06:17 +0000 (16:06 -0800)
committerJeff Donahue <jeff.donahue@gmail.com>
Fri, 6 Feb 2015 00:06:17 +0000 (16:06 -0800)
Layer type is a string


Trivial merge