Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 9 Jul 2014 08:45:25 +0000 (08:45 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 9 Jul 2014 08:45:25 +0000 (08:45 +0000)
commit2a25ec1053cb99c12dbcf30259c1cc29b6dadb97
tree288bcf62c5797f8e4c01210a8b9dc36d17f22334
parentee73f5ca095ed9a84ed4e1639c94c5d3bf6b8718
parent6f6e4334c601a30af8154dfec0d5a4a691e130f3
Merge remote branch 'origin/master' into wosch