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

[Peter Lemenkov]

commit 1f081ebf192e613e5339422523ab11334c0d3cd0
Merge: 0c90322 93ae8ed
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 28 12:58:45 2014 +0400

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

 erlang-ebloom.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---