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