tree 679f391992fd93faf09b75da5a7ad4eb60285e8b
parent 5a528b50a1ae693157e2bc55ba64b81e07abf63b
parent 2895047d1d341ad5ba299f0c228ce56825781f34
author Barbara Gomes <barbaramaltagomes@gmail.com> 1480466136 -0800
committer Barbara Gomes <barbaramaltagomes@gmail.com> 1480466136 -0800

Merge branch 'master' of github.com:apache/incubator-iota into IOTA-34

# Conflicts:
#	fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala