Merge "Fixes release tags and versions"
authorFrank Brockners <fbrockne@cisco.com>
Wed, 3 Jun 2015 17:33:59 +0000 (17:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Jun 2015 17:33:59 +0000 (17:33 +0000)

Trivial merge