Merge remote-tracking branch 'origin/master' into pr/506

Conflicts:
	Yii.gitignore
This commit is contained in:
Justin Spahr-Summers
2013-11-11 09:51:38 -08:00
76 changed files with 520 additions and 413 deletions

View File

@@ -3,4 +3,4 @@ assets/*
protected/runtime/*
!protected/runtime/.gitignore
protected/data/*.db
themes/classic/views/
themes/classic/views/