Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 7 May 2014 14:25:32 +0000 (14:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 7 May 2014 14:25:32 +0000 (14:25 +0000)
commitdb039259ace9fecb45fbee5ad9dd0b891ca64f9d
tree4399d92fce05d9728746aedaa9dcf8aa84ec3cef
parent9c4f25d2a63f2d9d51bf8cc6d5a6293ff4d348cc
parent7a8d060108bb2112b74fd3e33c916b6de883fef4
Merge remote branch 'origin/master' into wosch