Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 23 Apr 2014 12:18:03 +0000 (12:18 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 23 Apr 2014 12:18:03 +0000 (12:18 +0000)
commit5940980da31aee2530b966c777e13f80a0a502b9
treeba044e497b26d2f5d235f23c461ea1828b5b99cf
parentcd7c1d855215ed2f657d3ba3fe65525dd1e278e2
parentb46c4b42269ecabe17260f983a70f4b68b68dd18
Merge remote branch 'origin/master' into wosch