[SCM] image display tool for astronomy branch, upstream+dfsg, updated. cad154006886086877ce39f51ec86a26bdf4de0d

[Ole Streicher]

The following commit has been merged in the upstream+dfsg branch:
commit cad154006886086877ce39f51ec86a26bdf4de0d
Merge: 42336c2bd4de8ffdee075fcbd37f01a8403781f0 f6f5ad7a19a7c674dd427fb54f15a41a98d94d5e
Author: Ole Streicher <github at liska.ath.cx>
Date:   Wed Jun 6 16:05:55 2012 +0200

    Merge branch 'upstream' into upstream+dfsg


-- 
image display tool for astronomy