Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 14:19:45 +0000 (16:19 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 14:19:45 +0000 (16:19 +0200)
commitf10b37e0b60e7b085810d1fdfae2262c3976299e
tree351bb025fc49cb195fefccbb851f6119380c5350
parent6a7d796b9439b66671e4d206d071fe5d71455a55
parent0689574b8d0579dd869bf4d80b98c62134f7a99b
Merge remote-tracking branch 'origin/master' into wosch