After squabbling over retransmission fees for a month, and leaving Time Warner Cable customers without CBS or Showtime, CBS and Time Warner Cable came to an agreement that brought CBS programming back to TWC last night. While the terms weren't disclosed, CBS CEO Les Moonves said, "We are receiving fair compensation for CBS content."

The blackout affected millions of Time Warner Cable customers in major markets like NYC, LA and Dallas. When Time Warner Cable told customers to check out CBS programming online, CBS blocked Time Warner Cable broadband. The two parties were squabbling over the size of the retransmisison fee that TWC pays for CBS programming—TWC wanted to pay $1, while CBS wanted $2.

Many had predicted the dispute would soon be resolved because of the pro football season, which starts this weekend. Time Warner Cable's CEO Glenn Britt said, "While we certainly didn't get everything we wanted, ultimately we ended up in a much better place than when we started." The Times reports:

In his statement, Mr. Britt said Time Warner Cable ultimately “ended up in a much better place than when we started,” though he did not specify how. He also again pushed for some kind of change in the rule that granted networks the rights to compensation from cable companies for their programming

“The rules are woefully out of date, are the primary reason cable bills are rising,” Mr. Britt said. “We sincerely hope that policy makers heed that call and take action to prevent these unfortunate blackouts soon.”

Luckily, Time Warner Cable can gouge you in other ways. Anyway, in case you missed Bill Murray's visit to the Late Show with David Letterman last week—either because of TWC or you were busy pre-gaming for Labor Day—it's pretty hilarious: