]> gitweb.pimeys.fr Git - config-20-100.git/commit
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Fri, 6 Sep 2013 22:46:34 +0000 (00:46 +0200)
committerVincent Le Gallic <legallic@crans.org>
Fri, 6 Sep 2013 22:46:34 +0000 (00:46 +0200)
commit43e807910d1e37a8baa77eb8676f48447e4155fc
tree393233fb786672282ef06fe1bacdb444efa317c3
parent1802800fdf95e6b956f271e49f3044cd681224aa
parent907e1f773139f42002a05c68735ecc98c95408b7
Merge branch 'master' into perso

Conflicts:
.ssh/config
.procmailrc
.ssh/config