chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68c11dd 9d990cf)
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:20:24 +0000 (19:20 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:20:24 +0000 (19:20 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.