Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 17:34:59 +0000 (18:34 +0100)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 17:34:59 +0000 (18:34 +0100)
commita9756ba00b3c22326540870d3ab410f9a0c0f94a
tree21a21dd2393f30717a5a012810cb93178b41116f
parentd545cdd6064ef231bb9adcbcb836b1f9dd92d921
parent119f2d2698d5e997bf17c1d733dea08cbd9ba6ef
Merge remote-tracking branch 'origin/master' into wosch