chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6cfeb6 48f1b27)
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 8 Aug 2012 17:56:55 +0000 (18:56 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 8 Aug 2012 17:56:55 +0000 (18:56 +0100)

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