Merge remote-tracking branch 'remotes/origin/master'

This commit is contained in:
Martin Edenhofer 2012-04-13 15:51:59 +02:00
commit 0c8507a637

2
.gitignore vendored
View file

@ -16,3 +16,5 @@
# Ignore .project files # Ignore .project files
/.project /.project
db/schema.rb