Merge branch 'indigo' of ssh.ece.ufrgs.br:/srv/git/ufrgs_wam into indigo
authorWalter Fetter Lages <w.fetter@ieee.org>
Wed, 28 Nov 2018 21:26:06 +0000 (19:26 -0200)
committerWalter Fetter Lages <w.fetter@ieee.org>
Wed, 28 Nov 2018 21:26:06 +0000 (19:26 -0200)

Trivial merge