pere.pagekite.me Git - text-free-culture-lessig.git/commitdiff

]> pere.pagekite.me Git - text-free-culture-lessig.git/commitdiff

projects / text-free-culture-lessig.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cbad40 ccc3255)

author	ben <ben@saturne.(none)>
	Wed, 12 Aug 2015 13:57:18 +0000 (15:57 +0200)
committer	ben <ben@saturne.(none)>
	Wed, 12 Aug 2015 13:57:18 +0000 (15:57 +0200)

		1	2
freeculture.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge