Update to show 2.5.x branch
Move out of Joomla 2.5 folder now in a 2.5 branch
George's commits

merging in structure