[erlang/epel7: 2/2] Merge branch 'master' into epel7

[Peter Lemenkov]

commit 2a4618920d80ffb695365e021a8a094f7270e521
Merge: a929427 489a766
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Jun 11 13:13:48 2014 +0400

    Merge branch 'master' into epel7

 epmd at .service |   25 +++++++++++++++++++++++++
 erlang.spec   |   12 +++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
---