Merge remote-tracking branch 'origin/master'
authorAndreas Bilke <abilke@cosy.sbg.ac.at>
Tue, 26 Jul 2016 12:01:05 +0000 (14:01 +0200)
committerAndreas Bilke <abilke@cosy.sbg.ac.at>
Tue, 26 Jul 2016 12:01:05 +0000 (14:01 +0200)
commit53f92e82cada344f76e3d975af4725a4d8163e99
treee1023f77058729f7c95a539436c47bed7a0b0a37
parentb7093561d3cdff6b6b3d7471760cb5582e1be746
parentb188b641574c22f7007c7a5b08b6c5dd39d42459
Merge remote-tracking branch 'origin/master'