Merge commit 'a547d2685866898665fad221939b0b820a42a088' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:22:04 +0000 (00:22 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:22:04 +0000 (00:22 -0500)
commitcf079f627e370ee823f07604a9a42dccc59f2afd
tree3c85a79b77643911eaa6d56414965a1a3d3b534d
parent8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c
parenta547d2685866898665fad221939b0b820a42a088
Merge commit 'a547d2685866898665fad221939b0b820a42a088' into sipb

Conflicts:
templates/page.tmpl
IkiWiki/Plugin/git.pm
templates/page.tmpl