Merge branch 'master' of ssh://[email protected]/sip-router into postgres

* 'master' of ssh://[email protected]/sip-router:
  Ignore emacs backup and lock files.

.gitignore

@@ -26,4 +26,7 @@ TAGS
 test/udp_flood
 utils/gen_ha1/gen_ha1
 utils/sercmd/sercmd
-*~
+# Emacs backup files
+*~
+# Emacs file locks
+.#*