]> 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>
Mon, 3 Feb 2014 15:56:26 +0000 (16:56 +0100)
committerVincent Le Gallic <legallic@crans.org>
Mon, 3 Feb 2014 15:56:26 +0000 (16:56 +0100)
commit29a6e4464e35ce23ba1f66ce208520698c8de000
treeb8b394a0b55306aafebf97729b6094518f764ff4
parenta829cf46157b9ca67759211e4cada23de1a3e08b
parentf1116cc0bdd8ac9a0f1560560ca7a5431ffeb868
Merge branch 'master' into perso

Conflicts:
.bash_aliases
.bash_aliases