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

[Peter Lemenkov]

commit f89f4794b5b1b288b1ff3bb1242d5728434384b8
Merge: 23d0353 0562e6e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 28 12:41:08 2014 +0400

    Merge branch 'master' into f21
    
    Conflicts:
    	erlang-esdl.spec

 erlang-esdl.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---