Merge branch 'master' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 1 Oct 2013 13:37:05 +0000 (17:37 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 1 Oct 2013 13:37:05 +0000 (17:37 +0400)
commit6133aeede82a7eaeff06cba62b7146c9d8225182
treeb97bf6d28c45f0d52d4db383c2345b1e3a78e97a
parent81eb4bd8be9c31f6ab6d81c5a94e9d9bc17d2244
parent8717281e0ef69d74db4cd0efb6804ee949c1864f
Merge branch 'master' into merge-2.4

Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
doc/tutorials/definitions/tocDefinitions.rst