Merge branch 'master' of git://github.com/texane/stlink
authorMaxime Vincent <maxime.vincent@tass.be>
Sun, 1 Sep 2013 07:26:43 +0000 (09:26 +0200)
committerMaxime Vincent <maxime.vincent@tass.be>
Sun, 1 Sep 2013 07:26:43 +0000 (09:26 +0200)

Trivial merge