Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Apr 2014 15:26:34 +0000 (15:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Apr 2014 15:26:34 +0000 (15:26 +0000)
commit841726a9de1a59357270f33148e37255aa2e4486
tree673ea52c39d37c394b9472d9ab6e5f0c462a104d
parentca452bc42c8f645cebb4d70f9be0b2864037118c
parente006a92c8bb9c2c6c49fd067ac1fb01327aa56e1
Merge remote branch 'origin/master' into wosch