Merge remote branch 'catalystframework/master'
Tomas Doran [Fri, 11 Dec 2009 01:42:43 +0000 (01:42 +0000)]
* catalystframework/master:
  Fix .gitignore


Trivial merge