[Git] Merge branch 'p/muething/git-conversion-cleanup', resolved confllict.

Conflicts:
	.gitignore

.gitignore

 Makefile
 Makefile.in
-config.guess  
-config.h.in   
-config.log  
+config.guess
+config.h.in
+config.log
 config.status
-config.h      
-config.lt   
+config.h
+config.lt
 config.sub
 configure
 configure
@@ -23,12 +23,11 @@ stamp-h1
 dune-common-*.tar.gz
 dune-common-?.?
 ltmain.sh
-.libs
-.deps
+.libs/
+.deps/
+*.la
+*.o
+*.lo
+test-driver
 dependencies.m4
 dune.css
-config.h.in
-config.h
-config.log
-config.guess
-

bin/.gitignore

 Makefile
 Makefile.in
-.deps
 semantic.cache
 check-log-store
-
 *.swp
+xfail-compile-tests.log
+xfail-compile-tests.trs

dune/common/test/.gitignore

@@ -70,4 +70,5 @@ testdebugallocator_fail3
 testdebugallocator_fail4
 testdebugallocator_fail5
 eigenvaluestest
-
+*.log
+*.trs