Merge pull request #1330 from lenlen:plantuml

author Roman Donchenko <roman.donchenko@itseez.com>

Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc doc/conf.py
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
doc/conf.py	patch \|	diff1 \|	diff2 \|	blob \| history