Merge branch 'develop'

Conflicts: .gitignore
erasmusa · Oct 28, 2012 · 2248212 · 2248212
2 parents 2454796 + 83fdcd6
commit 2248212
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
+debian/files
+debian/*.substvars
+debian/*.debhelper.log
+debian/*/*
 howto_install.txt