Merge branch 'indigo_bhand' of ssh.ece.ufrgs.br:/srv/git/ufrgs_wam into indigo_bhand
authorWalter Fetter Lages <w.fetter@ieee.org>
Thu, 29 Nov 2018 19:49:03 +0000 (17:49 -0200)
committerWalter Fetter Lages <w.fetter@ieee.org>
Thu, 29 Nov 2018 19:49:03 +0000 (17:49 -0200)

Trivial merge