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

[Peter Lemenkov]

commit 654c42a0d149ed2aff847de71c112f58bf4d62b0
Merge: 385dc50 796d4ab
Author: Peter Lemenkov <lemenkov(a)gmail.com&gt;
Date:   Tue Nov 4 10:10:46 2014 +0300

    Merge branch 'master' into f21

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