diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-04-18 15:25:44 +0400 |
|---|---|---|
| committer | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-04-18 15:25:44 +0400 |
| commit | 1e02e152aea76d5af30c42708caaee2fb1f05ede (patch) | |
| tree | 57d6498fe5122f291f3e4899b1816487fc5bbff3 /Authors | |
| parent | 519c885a4e3622417cd78655a211a2f23033d610 (diff) | |
| parent | 9761e7690ab8f13a76c761ba6055372a0d29eaff (diff) | |
trunk merged. conflict resolved.
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -31,7 +31,9 @@ Jay Pipes <jaypipes@gmail.com> Jesse Andrews <anotherjesse@gmail.com> Joe Heck <heckj@mac.com> Joel Moore <joelbm24@gmail.com> +Johannes Erdfelt <johannes.erdfelt@rackspace.com> John Dewey <john@dewey.ws> +John Tran <jtran@attinteractive.com> Jonathan Bryce <jbryce@jbryce.com> Jordan Rinke <jordan@openstack.org> Josh Durgin <joshd@hq.newdream.net> @@ -72,5 +74,6 @@ Trey Morris <trey.morris@rackspace.com> Tushar Patil <tushar.vitthal.patil@gmail.com> Vasiliy Shlykov <vash@vasiliyshlykov.org> Vishvananda Ishaya <vishvananda@gmail.com> +Yoshiaki Tamura <yoshi@midokura.jp> Youcef Laribi <Youcef.Laribi@eu.citrix.com> Zhixue Wu <Zhixue.Wu@citrix.com> |