Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 27 Jun 2014 15:04:54 +0000 (17:04 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 27 Jun 2014 15:04:54 +0000 (17:04 +0200)

Trivial merge