commit 993a7624032510204fa3875f86dbc1f8763ff98d Merge: 60508c2 899c8dc Author: Peter Lemenkov <[email protected]> Date: Thu Aug 28 12:17:57 2014 +0400
Merge branch 'master' into f21
Conflicts:
erlang-emmap.spec
erlang-emmap.spec | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
---
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
