chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cefe28 ea54e71)
update from ref for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Aug 2012 14:41:25 +0000 (15:41 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Aug 2012 14:41:25 +0000 (15:41 +0100)

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