Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 29 Apr 2014 13:26:25 +0000 (13:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 29 Apr 2014 13:26:25 +0000 (13:26 +0000)
commit8d9cf5ca5921f2150742c41d1cbfbd4144ed4379
tree51bec65fb23d32e3e63303e4907857e90c936fa0
parent879ac5e92cfb287ff4e0126ed1e9b5abaf0ff077
parent7ae1021f9d0bfb90ef2e00aac14721bd52b60d29
Merge remote branch 'origin/master' into wosch