]> pere.pagekite.me Git - text-free-culture-lessig.git/commitdiff
projects / text-free-culture-lessig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32f4166 6e77070)
resolve conflict.
authorPetter Reinholdtsen <pere@hungry.com>
Wed, 24 Jul 2013 09:45:15 +0000 (11:45 +0200)
committerPetter Reinholdtsen <pere@hungry.com>
Wed, 24 Jul 2013 09:45:15 +0000 (11:45 +0200)

Trivial merge