Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Tue, 19 Nov 2013 19:06:12 +0000 (11:06 -0800)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 19 Nov 2013 19:06:12 +0000 (11:06 -0800)

Trivial merge