Merge remote-tracking branch 'origin/master' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 09:37:33 +0000 (13:37 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 09:37:33 +0000 (13:37 +0400)
commit30d7e1c33d70f90507d66ddd129d978eb1128ac7
treefb4b490fcfea96ee402d5f47989dbc1fe7f3589d
parent6133aeede82a7eaeff06cba62b7146c9d8225182
parent4c7ecf20d808c79e3044f266fd419757a76d82ac
Merge remote-tracking branch 'origin/master' into merge-2.4

Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~