commit 7e156aaf6a94b737e321210cfe06b65bdc33e474 Merge: 7eba6af ada4441 Author: Peter Lemenkov <[email protected]> Date: Thu Aug 28 12:52:08 2014 +0400
Merge branch 'master' into f21
Conflicts:
erlang-eleveldb.spec
erlang-eleveldb.spec | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
---
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
