tree b45860fd9e3b1c975267b043a591c773094c04f2
parent f25f47da311fdb8b27258e0bd780a35697723e53
parent 5831adff46e0f6eb09acd779d04d412f2c05eb18
author Michael Kuty <6du1ro.n@gmail.com> 1444991948 +0200
committer Michael Kuty <6du1ro.n@gmail.com> 1444991948 +0200

Merge branch 'feature/murano_protocol' into 'master'

add configurable murano protocol

See merge request !8