]> source.charles.plessy.org Git - source/.git/commitdiff
projects / source / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67dafca 1671dec)
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)
Conflicts:
Debian/debiâneries/étrange-megumi.en.po


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.