Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel
2013-05-18 20:52:08 +02:00
+4
View File
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore