Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into onload
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 19 Dec 2013 16:34:58 +0000 (16:34 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 19 Dec 2013 16:34:58 +0000 (16:34 +0000)

Trivial merge