diff options
| author | David Pravec <David.Pravec@danix.org> | 2010-12-24 02:10:40 +0100 |
|---|---|---|
| committer | David Pravec <David.Pravec@danix.org> | 2010-12-24 02:10:40 +0100 |
| commit | 6035549fb7a930a0f0995da7ae696a4dc1ebc548 (patch) | |
| tree | 6c85fed91e324f402c2b1fd4c2c86b4360e9be3d /Authors | |
| parent | 41b5e4a12d23308f2143dfb5a059c43a931370e2 (diff) | |
| parent | 8060b526e1fecc66a6766de3f9e4b008e69af1e3 (diff) | |
| download | nova-6035549fb7a930a0f0995da7ae696a4dc1ebc548.tar.gz nova-6035549fb7a930a0f0995da7ae696a4dc1ebc548.tar.xz nova-6035549fb7a930a0f0995da7ae696a4dc1ebc548.zip | |
merged trunk, resolved conflict
someone deleted process_unittest.py in trunk, so the problem in that one is gone now.
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4,6 +4,7 @@ Anthony Young <sleepsonthefloor@gmail.com> Armando Migliaccio <Armando.Migliaccio@eu.citrix.com> Chris Behrens <cbehrens@codestud.com> Chmouel Boudjnah <chmouel@chmouel.com> +David Pravec <David.Pravec@danix.org> Dean Troyer <dtroyer@gmail.com> Devin Carlen <devin.carlen@gmail.com> Ed Leafe <ed@leafe.com> |