Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Jul 2014 16:25:05 +0000 (16:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Jul 2014 16:25:05 +0000 (16:25 +0000)
commit41af6e8df5945d73d546785595c9b768cb2955df
tree8547954e34a0c2a7dff1c14a8f618f9c74c39523
parent034500d2c96eb15ac5a0106c7f33be0ea86df705
parent7bd030f15309e4349183ea5d5961378706f357d0
Merge remote branch 'origin/master' into wosch