]> pere.pagekite.me Git - text-free-culture-lessig.git/commit
Merge remote-tracking branch 'upstream/master'
authorben <ben@saturne.(none)>
Sat, 3 Oct 2015 20:08:38 +0000 (22:08 +0200)
committerben <ben@saturne.(none)>
Sat, 3 Oct 2015 20:08:38 +0000 (22:08 +0200)
commitfaace483a52cd0bbc44c53e6006a71a4f08f7ae9
treebc489f4a0ac6dfedbc5b7a440f6371bb79f222cb
parent019c8ed341b40dc8b32deee4c5b647142ead815c
parent750e0b6ba6c352471f7d1f584dc6ac6ddc6d6337
Merge remote-tracking branch 'upstream/master'

Conflicts:
freeculture.fr.po