]> gitweb.pimeys.fr Git - config-20-100.git/commit - .bash_aliases
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 11 Apr 2015 14:07:10 +0000 (16:07 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 11 Apr 2015 14:07:10 +0000 (16:07 +0200)
commit66a043648786b447643e00f2b5c7b1a599bb7740
tree119986c871706ecaae29785b0ff1f9e0f35544ed
parent9b78f63f6caad82daac6aa5549e074db150831ec
parent0ac3a144a2ce7f6e27271666686b19da215e702b
Merge branch 'master' into perso

Conflicts:
.bash_aliases
.procmailrc
.bash_aliases