]> gitweb.pimeys.fr Git - config-20-100.git/commit - .bash_aliases
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sun, 20 Oct 2013 00:01:12 +0000 (02:01 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sun, 20 Oct 2013 00:01:12 +0000 (02:01 +0200)
commitd4d4c5ee4cd401a8ae930560c17fed09fcfa1464
tree364454931733d435af54da46e0c849b441b7f808
parentf9ee4595ae0da2f65859684da0465782a301792d
parent7ab1af83d9ab9a0a71aaad84880f960698b8a3b9
Merge branch 'master' into perso

Conflicts:
.procmail/rc/custom.high.rules
.procmail/rc/custom.high.rules