[erlang-riak_core: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/erlang-riak_core

[Peter Lemenkov]

commit d77d7426bc11ad6f93bbeb9c411ba3df94a64414
Merge: 5a2d5c6 2095f2d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Jul 19 10:27:23 2012 +0400

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

 erlang-riak_core.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc erlang-riak_core.spec
index aedb56b,90433e5..e56b32e
--- a/erlang-riak_core.spec
+++ b/erlang-riak_core.spec
@@@ -7,7 -7,7 +7,7 @@@
  
  Name:		erlang-%{realname}
  Version:	1.1.2
--Release:	2%{?dist}
++Release:	3%{?dist}
  Summary:	Distributed systems infrastructure used by Riak
  Group:		Development/Languages
  License:	ASL 2.0
@@@ -102,9 -99,9 +102,12 @@@ rebar eunit -
  
  
  %changelog
- * Thu Jul 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-2
++* Thu Jul 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-3
 +- Re-export one handy function
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri May 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-1
  - Ver. 1.1.2