Obama loves Drupal

Anybody out there know the best integrated solution for a grassroots community website which needs both wiki and forum functionality?

I love Twiki/FOSWiki, and have used it for years. But it doesn't do web forums. And both Django and Drupal seem to have really solid forum capabilities, but their wikis suck. Obama loves Drupal, by the way — the new recovery.gov website is all Drupal. How weird that our President has an open source website. Rock on. (And you just know that McCain used ASP pages)

So, do I have to hack two separate systems together to get wiki+forum working, or is there some option that I've overlooked?

Billy's Happy Spot

O.M.G. I finally figured out how to merge all our code at work into one mega Git repository. You non-hackers out there must wonder why I would blog about this, but trust me on this one — this is a huge step for my team. Now, all of my staff & consultants can work in parallel on model updates, and I can pull their changes into our main codebase with the flick of my wrist. See that pretty picture? That's six lines of development all converging onto a single, happy spot. That's Billy's Happy Spot!!

It's amazing to me how open-source tools just keep trouncing the competition. Git has made my work life so much easier.