]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.normal.rules
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 8 Mar 2014 19:22:02 +0000 (20:22 +0100)
committerVincent Le Gallic <legallic@crans.org>
Sat, 8 Mar 2014 19:22:02 +0000 (20:22 +0100)
commit2686338939da8197a2c6fdd7ef52070b18c9d11b
treebdf60eebe99933230df4d620f2651cd9cc002a83
parent8bd7fa3563896ed4a31f2ebc88e8a23ccf908c6b
parentdc49a3c4e5f31d57c3a7835401b68840e3bcafec
Merge branch 'master' into perso

Conflicts:
.ssh/config
.bashrc
.ssh/config