Merge branch 'screenshot'
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 9 Oct 2014 15:04:58 +0000 (15:04 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 9 Oct 2014 15:04:58 +0000 (15:04 +0000)

Trivial merge