Merge branch 'master' into 1.3

This commit is contained in:
gwoo 2009-05-01 10:52:40 -07:00
commit 29ed525dd1

1
.gitignore vendored
View file

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