Renamed php-kohana to kohana
Merge branch 'fix-kohana'