merge all .gitignore files in a single file
Merge branch 'master' of https://github.com/belnet-ict/otrs
Improved ordering.
Corrected ordering
Merge remote-tracking branch 'upstream/master'