summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorDavid Smith <dsmith@redhat.com>2009-06-16 12:22:32 -0500
committerDavid Smith <dsmith@redhat.com>2009-06-16 12:22:32 -0500
commitbdbb4549b459294ed9bddb819e5602fb894313f7 (patch)
tree9d242348f8e2776c0d4841d0586d3b9b8d34ef7c /AUTHORS
parentd05b7a1c363c30c7fcd9d163f457c1ed80d28f19 (diff)
parent96b190d404d24eb7349adae6e2d57eb5c9f6c26a (diff)
downloadsystemtap-steved-bdbb4549b459294ed9bddb819e5602fb894313f7.tar.gz
systemtap-steved-bdbb4549b459294ed9bddb819e5602fb894313f7.tar.xz
systemtap-steved-bdbb4549b459294ed9bddb819e5602fb894313f7.zip
Merge commit 'origin/master' into pr7043
Conflicts: runtime/transport/transport.c
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 417d6fc0..4ae6c8ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,7 +40,7 @@ Nobuhiro Tachino
Petr Muller
Phil Muldoon
Prerna Saxena
-Przemyslaw Pawelczyk
+Przemysław Pawełczyk
Rajan Arora
Roland McGrath
Shaohua Li