Merge branch 'ivan/feature/tuf-integration' into develop
authorRuben Pollan <meskio@sindominio.net>
Wed, 8 Oct 2014 14:29:26 +0000 (09:29 -0500)
committerRuben Pollan <meskio@sindominio.net>
Wed, 8 Oct 2014 14:29:26 +0000 (09:29 -0500)

Trivial merge