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)
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst

1  2 
doc/tutorials/definitions/tocDefinitions.rst

@@@ -11,4 -11,4 +11,5 @@@
  .. |Author_EricCh| unicode:: Eric U+0020 Christiansen
  .. |Author_AndreyP| unicode:: Andrey U+0020 Pavlenko
  .. |Author_AlexS| unicode:: Alexander U+0020 Smorkalov
- .. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z
++.. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z
+ .. |Author_DomenicoB| unicode:: Domenico U+0020 Daniele U+0020 Bloisi