Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 22 May 2014 07:38:55 +0000 (09:38 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 22 May 2014 07:38:55 +0000 (09:38 +0200)
commit8a8764dcfd0d5b9ab8eb7c062bb347a50a2a5e57
tree9436aa80be16fee6fed96c985230f6df731c6d8d
parent36192b90cd53bb600aac77662fc6656ed4d75414
parent953b2eba5f596897c7e4373b08d78e35c9941c16
Merge remote-tracking branch 'origin/master' into wosch