]> 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, 9 Nov 2014 12:40:22 +0000 (21:40 +0900)
committerCharles Plessy <https://launchpad.net/~plessy>
Sun, 9 Nov 2014 12:40:22 +0000 (21:40 +0900)
commit7c9a8250f3733f34e379695511632397d7cac0d1
tree417e637737042038426290396f52fb72ebb1051e
parent3b8777e5aa65d4cd7f959b73331bb0dd2c3f3cd7
parent72bc739224cf0784c0ee5efa931fef902ec755ff
Merge branch 'master' of ssh://charles-plessy-org.branchable.com

Conflicts:
Debian/debiâneries/résolution-générale.en.po
Debian/debiâneries/résolution-générale.en.po