Merge remote branch 'origin/popup'
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 12:13:01 +0000 (12:13 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 12:13:01 +0000 (12:13 +0000)

Trivial merge