Merge branch 'master' into 1.2

This commit is contained in:
gwoo 2009-05-01 11:33:47 -07:00
commit f0879f96ed

1
.gitignore vendored
View file

@ -1 +1,2 @@
app/tmp
vendors