]> source.charles.plessy.org Git - source/.git/commitdiff
Merge branch 'master' of ssh://charles-plessy-org.branchable.com
authorCharles Plessy <https://launchpad.net/~plessy>
Sun, 1 Jan 2012 10:28:06 +0000 (19:28 +0900)
committerCharles Plessy <https://launchpad.net/~plessy>
Sun, 1 Jan 2012 10:28:06 +0000 (19:28 +0900)
Conflicts:
Debian/debiâneries/tout-dans-git.en.po


Trivial merge