← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to .mailmap

  • Committer: Brian Waldon
  • Date: 2011-07-26 17:13:41 UTC
  • mfrom: (1324 nova)
  • mto: This revision was merged to the branch mainline in revision 1326.
  • Revision ID: brian.waldon@rackspace.com-20110726171341-jrclqn08ew7ngshr
merging trunk; resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
.mailmap
14
14
<code@term.ie> <github@anarkystic.com>
15
15
<code@term.ie> <termie@preciousroy.local>
16
16
<corywright@gmail.com> <cory.wright@rackspace.com>
 
17
<dan@nicira.com> <danwent@dan-xs3-cs>
17
18
<devin.carlen@gmail.com> <devcamcar@illian.local>
18
19
<ewan.mellor@citrix.com> <emellor@silver>
19
20
<itoumsn@nttdata.co.jp> <itoumsn@shayol>