Merge branch 'dev-erlang-version-bumps'
authorAmadeusz Żołnowski <aidecoe@gentoo.org>
Fri, 30 Dec 2016 23:36:01 +0000 (23:36 +0000)
committerAmadeusz Żołnowski <aidecoe@gentoo.org>
Fri, 30 Dec 2016 23:36:01 +0000 (23:36 +0000)

Trivial merge