Merge tag 'upstream/2.10.0+dfsg'

Upstream version 2.10.0+dfsg

Merge tag 'upstream/2.10.0+dfsg'
Upstream version 2.10.0+dfsg
f06eb95f · Olivier Sallou · d58818e1 · 55bbaffd · d58818e1 · d58818e1
Commit f06eb95f authored 9 years ago by Olivier Sallou
--- a/doc/image/img-lena-win.jpg
+++ b/doc/image/img-lena-win.jpg
--- a/doc/image/img-lena.png
+++ b/doc/image/img-lena.png
--- a/tutorial/image/lena.bmp
+++ b/tutorial/image/lena.bmp
--- a/tutorial/image/lena.ppm
+++ b/tutorial/image/lena.ppm