]> 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, 28 Sep 2013 23:20:39 +0000 (01:20 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 28 Sep 2013 23:20:39 +0000 (01:20 +0200)
commit244c7ad0123f7c9cc706cc0e8a38d48aee2311d4
tree8e4f10675402f652e75c84040508b1d5f4f64d7b
parent86a8f58eea7a6a1d447bcd69165d6ef3b668d11c
parent1687e7ed006b07852a0e5785c26a21ac7cb71608
Merge branch 'master' into perso

Conflicts:
.bash_aliases
.bash_aliases