Merge branch 'master' of https://github.com/yurovsky/stlink
authorFabien Le Mentec <texane@gmail.com>
Sun, 23 Jun 2013 11:48:38 +0000 (06:48 -0500)
committerFabien Le Mentec <texane@gmail.com>
Sun, 23 Jun 2013 11:48:38 +0000 (06:48 -0500)

Trivial merge