Did Diddy do it?

A retired member of the LAPD, Greg Kading, is claiming that Diddy aka Puff Daddy aka Sean Combs ordered Tupak Shakur's murder on Sept. 13, 1996 in Las Vegas.

The former cop is alleging that Diddy paid Crips member Duane Keith (Keffe D) $1 million to put a hit on Shakur and his manager Suge Knight, according to the Huffington Post.

Apparently Keith’s nephew, Orlando (Baby Lane) Anderson, committed the crime but only got Shakur.

The ex cop, who once led a task force investigating the shooting deaths of Shakur and Biggie Smalls, also claims that in retaliation for Shakur's death, Knight paid $13,000 to Bloods member Wardell (Poochie) Fouse, to kill Smalls, who was Diddy's close friend. Smalls was gunned down in Los Angeles on March 9, 1997.

Kading says he got Keffe D to confess to it all when he feared being charged with another crime.

This case still leaves us scratching our heads -- it's like the Black Dahlia of the '90s! WE JUST WANT TO KNOW WHO KILLED TUPAC AND BIGGIE!