Merge pull request #10092 from alalek:dnn_rename_caffe_proto
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 22 Nov 2017 08:16:20 +0000 (08:16 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 22 Nov 2017 08:16:20 +0000 (08:16 +0000)

Trivial merge