Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 19 May 2014 11:25:47 +0000 (11:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 19 May 2014 11:25:47 +0000 (11:25 +0000)
commit87e437e95ac144302591a2e5515aec09efcd7200
treeb9ba4c1307972bf594e520dfb4a190701b307b80
parent0d023cdd6c0cfbfbd5ba91fb1a9ccd0077ef5b8e
parentaadb4256e4fe86cc30cdb76438f2ba577f6cbc56
Merge remote branch 'origin/master' into wosch