]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a0b521 f8882de)
Merge branch 'debian-jessie' into debian-jessie-security
authorSimon McVittie <smcv@debian.org>
Wed, 11 Jan 2017 18:04:28 +0000 (18:04 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 11 Jan 2017 18:04:28 +0000 (18:04 +0000)

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