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

[Peter Lemenkov]

commit 385dc504840e390efd3692a8331bdd60e2cfd680
Merge: 8ba8160 c83b079
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 28 13:04:33 2014 +0400

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

 erlang-cl.spec |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---