Merge remote-tracking branch 'upstream/master' into travis-add-autotools-build
authorJerry Jacobs <jerry.jacobs@dualinventive.com>
Mon, 2 May 2016 15:11:56 +0000 (17:11 +0200)
committerJerry Jacobs <jerry.jacobs@dualinventive.com>
Mon, 2 May 2016 15:11:56 +0000 (17:11 +0200)
* upstream/master:
  st-info: --probe: Due to already claimed stlink one of them was zero. Fixes #401.


Trivial merge