Merge branches 'lh/submodules' and 'pb/am'

diff --git a/.gitignore b/.gitignore
index 8fc492379242facc11bb863699f7aa7b2d52f75e..15aed7063134c041011fe3582627ad19c3f381da 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@ git-add--interactive
 git-am
 git-annotate
 git-apply
-git-applymbox
-git-applypatch
 git-archimport
 git-archive
 git-bisect