Merge branch 'hp-dv6426us-par' into identica-mode-1.2hp-dv6426us-par/identica-mode-1.2

Conflicts:
	.emacs

1 files changed, 27 insertions, 27 deletions

diff --git a/.git.info.exclude b/.git.info.exclude
index 35e6e7e..ab160af 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -13,8 +13,10 @@
 
 # Ignore these for privacy
 .ssh/*
-.netrc
+!.ssh/config
 .gnupg/*
+!.gnupg/gpg.conf
+.netrc
 
 # Ignore temp/log/history files
 *.log
@@ -32,39 +34,42 @@ tmp
 \#*#
 .~lock.*#
 *_history
+*_hist
 history.*
 *authority
 *.cookie
 
 # Ignore these special-purpose cache/temp files
-.xsession-errors*
+.alsa.save
 .camel_certs
-.kde/socket-*
+.compiz/session/*
+.config/chromium/Default/History\ Index*
+.dbus/session-bus/*
+.dvdcss
+.esd_auth
+.eshell/history
+.evolution/.*
+.gconfd/saved_state
+.gnash-media
+.gnash/SharedObjects/*
 .kde/share/apps/RecentDocuments/*
+.kde/socket-*
+.lesshst
+.links2/links.his
+.local/share/Trash/*
 .local/share/gvfs-metadata/*
 .local/share/icons/*
 .mozilla/firefox/Crash\ Reports/*
-.compiz/session/*
-.dbus/session-bus/*
-.thumbnails/*
-.gnash/SharedObjects/*
-.config/chromium/Default/History\ Index*
-.evolution/.*
-.shotwell/thumbs/*
-.netbeans/*/update_tracking/*
 .netbeans/*/modules/*
-.local/share/Trash/*
-.links2/links.his
-.eshell/history
-.sudo_as_admin_successful
-.lesshst
-.gconfd/saved_state
-.esd_auth
-.recently-used.xbel*
+.netbeans/*/update_tracking/*
+.pki
 .pulse
 .pulse-cookie
-.pki
-.alsa.save
+.recently-used.xbel*
+.shotwell/thumbs/*
+.sudo_as_admin_successful
+.thumbnails/*
+.xsession-errors*
 
 # Ignore files that are autogenerated
 .folders
@@ -73,10 +78,5 @@ history.*
 # Ignore these files for no good reason
 .terminfo
 .wine*
-.prefix
 .offlineimap
-.crontab.local
-.xmodmap
-.elmo
-.ido.last
-.bogofilter/*
+.bogofilter