I'm so glad this little war is over. Being a DirecTV customer for many years now, I have seen them go through a few battles, but nothing as large scale as this recent war with Viacom. Now, I can watch Tosh.0 again on Tuesday night. Nothing makes my week more complete than a few videos of guys getting hit in the nuts as well as a few select videos of people projectile vomiting!

Seventeen Viacom channels -- including MTV, Comedy Central and Nickelodeon -- had not been accessible to some 20 million DirecTV customers since July 10 as the two companies haggled over how much DirecTV should pay to carry those channels.

The terms of the deal announced Friday was not disclosed.

On Tuesday, Viacom decided to let new episodes of "The Daily Show with Jon Stewart" and "The Colbert Report" be shown on its websites, easing a blockade of online viewings that it imposed last week.