commit 28b107ba1d8fbc5f81201a027a31ec397b3d3a21 Merge: 505ec10 15459f0 Author: Peter Lemenkov <[email protected]> Date: Thu Aug 28 12:37:25 2014 +0400
Merge branch 'master' into f21
Conflicts:
erlang-js.spec
erlang-js.spec | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
---
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
