]> 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: 15486e2 b342cdc)
Merge remote-tracking branch 'marsgui/master'
authorPetter Reinholdtsen <pere@hungry.com>
Mon, 5 Oct 2015 21:24:53 +0000 (23:24 +0200)
committerPetter Reinholdtsen <pere@hungry.com>
Mon, 5 Oct 2015 21:24:53 +0000 (23:24 +0200)

Trivial merge