merge from trunk and update .mailmap file

This commit is contained in:
William Wolf
2011-05-11 15:16:37 -04:00
3 changed files with 6 additions and 1 deletions

View File

@@ -31,3 +31,6 @@ sphinx
glance
nova-adminclient
suds==0.4
coverage
nosexcover
GitPython