#124:conflict-resolution
commit3e9a29dd567ef154f2d80e5a3255ab2a4b114d0d
authordustin <dustin@v.igoro.us>
Fri, 16 May 2008 02:41:32 +0000 (16 03:41 +0100)
committerdustin <dustin@v.igoro.us>
Fri, 16 May 2008 02:41:32 +0000 (16 03:41 +0100)
treecb209fed027ecdecde44ea30b4653ac80bac21c3
parentfa419be5204d4569039574d1d045dbbd5120377c
parent6dfc0b29d32c8d02d64cd77ffa1dd2293cf548a3
#124:conflict-resolution
buildbot/test/test_properties.py
docs/buildbot.texinfo