]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a066e04 937c074)
Merge remote-tracking branch 'remotes/pelle/patch/img_size'
authorJoey Hess <joey@kitenet.net>
Thu, 17 Nov 2011 22:44:27 +0000 (18:44 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Nov 2011 22:44:27 +0000 (18:44 -0400)

Trivial merge
wiki compiler