Skip to content

Commit

Permalink
Merge commit '28b86b7719658b24f806fb8bd5b483f819fca9a6' into jinja
Browse files Browse the repository at this point in the history 
(Already fixed in jinja)

Conflicts:
	buildbot/status/web/builder.py
  • Loading branch information
@marcus-sonestedt
marcus-sonestedt committed Dec 19, 2009
2 parents d26cbce + 28b86b7 commit 5ff1332
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5ff1332

Please sign in to comment.