d77d742 Merge branch 'master' of ssh://pkgs.fedoraproject.org/erlang-riak_core

Merged and Committed by peter 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/erlang-riak_core
    
    Conflicts:
    	erlang-riak_core.spec
    
        
file modified
+5 -2