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

[Peter Lemenkov]

commit c53a7ea86e1ac8d6a9f0e9a10311d59a44344bd9
Merge: 993a762 1359728
Author: Peter Lemenkov <lemenkov(a)gmail.com&gt;
Date:   Tue Nov 4 10:19:42 2014 +0300

    Merge branch 'master' into f21

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