Merge remote branch 'origin/master' into pypy

Author: tobami

tools/create_trunks.py

@@ -39,15 +39,17 @@ def import_from_string(name):
 setup_environ(settings)
 from codespeed.models import Branch, Project
 
+
 def main():
     """Add Branch default to projects if not there"""
     projects = Project.objects.all()
 
     for proj in projects:
-        if not proj.branches.get(name='default'):
+        if not proj.branches.filter(name='default'):
             trunk = Branch(name='default', project = proj)
             trunk.save()
             print "Created branch 'default' for project {0}".format(proj)
 
+
 if __name__ == '__main__':
     main()