Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Tue, 15 Oct 2013 05:54:41 +0000 (22:54 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 15 Oct 2013 05:54:41 +0000 (22:54 -0700)

Trivial merge