[erlang-esdl/f21: 2/2] Merge branch 'master' into f21

[Peter Lemenkov]

commit 33fa58cdb9651a11a9e56e19b40c4ef4572c06ae
Merge: f89f479 d10774c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Nov 4 10:15:44 2014 +0300

    Merge branch 'master' into f21

 erlang-esdl.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---