]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/ML_perso
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 28 Sep 2013 22:50:26 +0000 (00:50 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 28 Sep 2013 22:50:26 +0000 (00:50 +0200)
commit86a8f58eea7a6a1d447bcd69165d6ef3b668d11c
tree74244d6235afcb9b1c05bb3ffdafc84c3433bbdd
parent27de2afcd65ec44b1cad9c525e3625d85fc415e2
parent124a7976ed2c7c8c7ce27067486263ef43d9e7cc
Merge branch 'master' into perso

Conflicts:
.bash_aliases
.bash_aliases