commit c3add7940d16a54609765dd27c77af36e40348ad Merge: 889af6e 05df0d5 Author: Peter Lemenkov <[email protected]> Date: Thu Aug 28 13:10:25 2014 +0400
Merge branch 'master' into f21
Conflicts:
erlang-bitcask.spec
erlang-bitcask.spec | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
---
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
