Merge branch 'master' into devel

Conflicts:
	app/plaYUVerApp.cpp
This commit is contained in:
jfmcarreira committed 2014-12-10 23:20:30 +00:00
commit 8b022b6a84

Diff Content Not Available