projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14947b4 154c4ea)
Merge remote-tracking branch 'anarcat/dev/proxy-utf8-fail'
authorJoey Hess <joey@kitenet.net>
Tue, 25 Feb 2014 04:13:36 +0000 (00:13 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Feb 2014 04:13:36 +0000 (00:13 -0400)

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