]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.high.rules
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 11 Apr 2015 15:04:46 +0000 (17:04 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 11 Apr 2015 15:04:46 +0000 (17:04 +0200)
commit450f5ab24e9ac6f8c4eff7008bec64ab35eabcf2
tree42c1bbe999bc2f54f669fbe05bd33642b3e21b57
parentdff90925312116515fd40ed69ef735174bc8832f
parenta837668ed64a1eeab0a06d446cd32180c9b9892a
Merge branch 'master' into perso

Conflicts:
.ssh/config
.ssh/config