Merge remote-tracking branch 'upstream/master' into travis-add-autotools-build
[fw/stlink] / ACKNOWLEDGMENTS
2011-10-16 Karl PalssonMerge branch 'master' of https://github.com/texane...
2011-10-14 Fabien Le Mentec[add] acknowledgments