Merge branch 'master' of /home/manu/public_git/kolter-dotfiles

.mutt/conf/my-headers

@@ -15,5 +15,5 @@ unmy_hdr *
 # defines
 my_hdr User-Agent: `mutt -v | head -1`
 my_hdr X-Operating-System: Debian GNU/`uname -s` `cat /etc/debian_version` (`uname -r`)
-my_hdr X-GnuPG-KeyID: 414EC36E
-my_hdr X-GPG-Fingerprint: 04DE 2F33 3CEF EF4F 46BF D6EA A475 EA19 414E C36E
+my_hdr X-GnuPG-KeyID: 929D42C3
+my_hdr X-GPG-Fingerprint: 4D0D 537E 8C37 BC99 DFF1 0B87 4B07 7723 929D 42C3

.signatures/main

@@ -1,4 +1,4 @@
 Emmanuel Bouthenot
-  mail: kolter@{openics,debian}.org    gpg: 1024D/0x414EC36E
+  mail: kolter@{openics,debian}.org    gpg: 4096R/0x929D42C3
   xmpp: kolter@im.openics.org          irc: kolter@{freenode,oftc}