Merge branch 'master' into config-format

Conflicts: .gitignore
sambostock · Aug 5, 2014 · 2a773f1 · 2a773f1
2 parents d412c85 + 07ef4d8
commit 2a773f1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,12 +10,12 @@ Thumbs.db
 .AppleDouble
 
 
-# Ignore config #
-#################
+# Ignore config directory #
+###########################
 config/
 config.yaml
 
 
 # Ignore log directory #
 ########################
-log/
+log/