chiark / gitweb /
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)
commit24020d0819040e2a5f2baeb01f2e207e3a3d6dd0
tree59b34b48bc64612f27c4834a4094387e11c34ed3
parent7cefe28559bd722ceb273ce086a1befac143be89
parentea54e71397799c16cde4f6d55d57195aea439ce9
update from ref for-upstream (merge -s theirs)