]> source.charles.plessy.org Git - source.git/commit
Merge branch 'master' of ssh://charles-plessy-org.branchable.com
authorCharles Plessy <https://launchpad.net/~plessy>
Mon, 15 Jul 2013 01:05:48 +0000 (10:05 +0900)
committerCharles Plessy <https://launchpad.net/~plessy>
Mon, 15 Jul 2013 01:05:48 +0000 (10:05 +0900)
commitf59fd4070f1e36ccc558bf5021dd375e65ca0788
tree42ab7ce1957998a4db56706cfcbb708eb8e0bde9
parent618bcd8d67fb7a7296e3c51457806db30804bd96
parent3a0951950adc94a9c19c5419e7a0fdf013dd983d
Merge branch 'master' of ssh://charles-plessy-org.branchable.com

Conflicts:
Debian/debiâneries/triggers.en.po