Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 25 Apr 2014 15:03:23 +0000 (15:03 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 25 Apr 2014 15:03:23 +0000 (15:03 +0000)
commitd13fec8dd2b8ad0c9a898e63c4b69fbc51bb5672
treee0a61578c20ade6712ddbe23c5b9ad3c07a62e37
parent4a77b3e3ada83064127aa06aaf66dcb12bc2bcc7
parent9f5634aae3265dff242615b82419ca15f3dc3d14
Merge remote branch 'origin/master' into wosch