]> source.charles.plessy.org Git - source.git/commit
Merge branch 'master' of ssh://charles-plessy-org.branchable.com
authorCharles Plessy <https://launchpad.net/~plessy>
Sun, 7 Oct 2012 13:29:40 +0000 (22:29 +0900)
committerCharles Plessy <https://launchpad.net/~plessy>
Sun, 7 Oct 2012 13:29:40 +0000 (22:29 +0900)
commit9faacb2c9ef594bfedb0a93d3499b06c7632085e
tree22b5f21cc2055443b0a9e467b125ce146749e1da
parentaaf338e34eda970e4f3e2279fb7b348953f30c47
parent5550832c52b7d3455a01378251ac363abc2bb526
Merge branch 'master' of ssh://charles-plessy-org.branchable.com

Conflicts:
index.en.po
index.mdwn