Merge branch 'popup'
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 11:50:15 +0000 (11:50 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 11:50:15 +0000 (11:50 +0000)

Trivial merge