From 064bed33c88c25f3538a4c80a6c2740c88d10464 Mon Sep 17 00:00:00 2001
From: Patrick Simianer <p@simianer.de>
Date: Mon, 23 Jun 2014 21:05:03 +0200
Subject: merge

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index f15146c..8b3ccd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,9 +61,12 @@
 .zshrcp
 bin
 lib/
+Maildir/
 papers/
+public_html/
 src/
 stuff/
 thesis/
 vimwiki/
+vim/
 z/
-- 
cgit v1.2.3