Back-merge branch 'master' into dev (for fix in PR #1203)
authorJeff Donahue <jeff.donahue@gmail.com>
Wed, 1 Oct 2014 21:47:16 +0000 (14:47 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Wed, 1 Oct 2014 21:47:35 +0000 (14:47 -0700)
1  2 
src/caffe/solver.cpp

Simple merge