aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJulio Merino <jmmv@google.com>2016-02-08 11:57:52 -0500
committerJulio Merino <jmmv@meroh.net>2016-02-08 20:50:23 -0500
commitb7e8fee81be3a91e55d4d56c5f4f4f2e8ce1e8bf (patch)
treeefd73c2b4d91c941b72d8c5d9aaa88cd211bfd67 /AUTHORS
parent869aa42e97e26365b83b1f779ecab209ee8f4b39 (diff)
downloadsshfs-b7e8fee81be3a91e55d4d56c5f4f4f2e8ce1e8bf.tar
sshfs-b7e8fee81be3a91e55d4d56c5f4f4f2e8ce1e8bf.tar.gz
sshfs-b7e8fee81be3a91e55d4d56c5f4f4f2e8ce1e8bf.tar.bz2
sshfs-b7e8fee81be3a91e55d4d56c5f4f4f2e8ce1e8bf.zip
Sync AUTHORS list after osxfuse-sshfs's merge
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS4
1 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 21a9b75..9f05a8f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,8 +15,12 @@ Contributors (autogenerated list)
Alan Jenkins <alan.christopher.jenkins@gmail.com>
Alexander Neumann <alexander@bumpern.de>
+Benjamin Fleischer <fleiben@gmail.com>
Chris Wolfe <cwolfe@chromium.org>
+Google Inc.
+Julio Merino <jmmv@google.com>
Mike Kelly <mike@pair.com>
Miklos Szeredi <miklos@szeredi.hu>
Nikolaus Rath <Nikolaus@rath.org>
Percy Jahn <email@percyjahn.de>
+Qais Patankar <qaisjp@gmail.com>