commit fcbecd10601760701aa6a6083dd972cee9c24941 Merge: 1e2c40d 6da5ea9 Author: Peter Lemenkov <[email protected]> Date: Thu Aug 28 12:05:28 2014 +0400
Merge branch 'master' into f21
Conflicts:
erlang-snappy.spec
erlang-snappy.spec | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
---
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
