diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-04-07 15:09:48 -0700 |
|---|---|---|
| committer | Ken Pepple <ken.pepple@gmail.com> | 2011-04-07 15:09:48 -0700 |
| commit | 3c67f142e5587641e45fcf05d98fddffa0d67d9f (patch) | |
| tree | b4e27f3643da04294f8cbbff19a175a870e59965 /Authors | |
| parent | 59b460e98c5b8f718a654539c5788e8775126dfd (diff) | |
| parent | 9616fba3e13567b1e84d951857eaf0463161fdbe (diff) | |
merged trunk and resolved conflict
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -32,6 +32,7 @@ Jesse Andrews <anotherjesse@gmail.com> Joe Heck <heckj@mac.com> Joel Moore <joelbm24@gmail.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> |