]> 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, 13 Feb 2012 14:09:18 +0000 (23:09 +0900)
committerCharles Plessy <https://launchpad.net/~plessy>
Mon, 13 Feb 2012 14:09:18 +0000 (23:09 +0900)
commit039eaf8f5114db560d712d12555815a03a80289b
tree17904e0fa0714bedbc5cc80f53e7fd7b28de03ef
parent67dafca76e77fb5bb0e63d7abdeaa9afecc166f8
parent1671decbf0ba362fd1896d8f57132ce0651448ba
Merge branch 'master' of ssh://charles-plessy-org.branchable.com

Conflicts:
Debian/debiâneries/étrange-megumi.en.po