Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 7 May 2014 12:38:24 +0000 (12:38 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 7 May 2014 12:38:24 +0000 (12:38 +0000)
commit9c4f25d2a63f2d9d51bf8cc6d5a6293ff4d348cc
tree8d827441826d3b2f651c0fc452498528a8b106c4
parent40c4cf423007caf35606c53b39f16958e0c55010
parentbe7a6e4458bf11cfc17e6afbabb0ed9a1c7c1a50
Merge remote branch 'origin/master' into wosch