diff options
author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-09-08 13:54:10 +0000 |
---|---|---|
committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-09-08 13:54:10 +0000 |
commit | 60a54cfe6111166fe643ccc753f6f9d6265c4fac (patch) | |
tree | c999f68764fd3b5f646dba3233a90b75521d5b41 /.mailmap | |
parent | 15fe2208e858434c6a6f8ee329055da2ce77b348 (diff) | |
parent | bb3b61b61dc4b45fba4bdab7ead69af239eac40a (diff) | |
download | nova-60a54cfe6111166fe643ccc753f6f9d6265c4fac.tar.gz |
Merge with trunk
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -15,6 +15,7 @@ <code@term.ie> <termie@preciousroy.local> <corywright@gmail.com> <cory.wright@rackspace.com> <dan@nicira.com> <danwent@dan-xs3-cs> +<dan@nicira.com> danwent@gmail.com <devin.carlen@gmail.com> <devcamcar@illian.local> <ewan.mellor@citrix.com> <emellor@silver> <itoumsn@nttdata.co.jp> <itoumsn@shayol> |