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

author Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>

Mon, 11 Nov 2013 17:51:38 +0000 (09:51 -0800)

committer Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>

Mon, 11 Nov 2013 17:51:38 +0000 (09:51 -0800)
author Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Mon, 11 Nov 2013 17:51:38 +0000 (09:51 -0800)
committer Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Mon, 11 Nov 2013 17:51:38 +0000 (09:51 -0800)
diff --cc Yii.gitignore

index 834eb17c2ec46e0b75ca59706dc5dafbb9245060,33a5154d68a930f95bb43a05ee3e5c4b38379fab..70f087546f2c77ed7f0c921f4a1011ac765a0481
--- 1/Yii.gitignore
--- 2/Yii.gitignore
+++ b/Yii.gitignore
@@@ -1,6 -1,3 +1,6 @@@
- -assets/
- -protected/runtime/
+ +assets/*
+ +!assets/.gitignore
+ +protected/runtime/*
+ +!protected/runtime/.gitignore
+ +protected/data/*.db
- themes/classic/views/
+ themes/classic/views/
author	Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
	Mon, 11 Nov 2013 17:51:38 +0000 (09:51 -0800)
committer	Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
	Mon, 11 Nov 2013 17:51:38 +0000 (09:51 -0800)