]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:59:07 +0000 (00:59 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:59:07 +0000 (00:59 -0500)
1  2 
IkiWiki/Plugin/git.pm
IkiWiki/Wrapper.pm

Simple merge
Simple merge