diff options
| author |   Dan Klein <danklei@cisco.com> | 2015-08-24 18:44:56 +0300 |
|---|---|---|
| committer | Dan Klein <danklei@cisco.com> | 2015-08-24 18:44:56 +0300 |
| commit | 98bc71b1c21452c3d868c4a4d418a8aeaa5a43af (patch) | |
| tree | 2e66b9a775f0a5c545caa76f62890f5a5546e231 /CONTRIBUTORS | |
| parent | 20eb7d362f9bce1951bd61ad3f78cf8f4267d1d5 (diff) | |
| parent | 36c6c87fe4380b214f8ff8a45dc0213fa109821c (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'CONTRIBUTORS')
| -rwxr-xr-x | CONTRIBUTORS | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 06929302..57d19820 100755 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,5 +1,5 @@ -Hanoh haim -Dave Johnson -Wenxian Li -Dan Klein - +Hanoh haim +Dave Johnson +Wenxian Li +Dan Klein +Itay Marom |