]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'a4f381ace837a032bc202cc6b2a98e922d4b7cfc' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:51:30 +0000 (00:51 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:51:30 +0000 (00:51 -0500)
commite0109e37d199bdb57eee65b014e974162c76cefe
tree97ae2ca00e223f14a5652e22976a1fdba472d9d9
parenta58c3cfcbfcfc3f6d660642b187e61aa75472e6f
parenta4f381ace837a032bc202cc6b2a98e922d4b7cfc
Merge commit 'a4f381ace837a032bc202cc6b2a98e922d4b7cfc' into sipb

Conflicts:
IkiWiki/Plugin/git.pm
IkiWiki/Plugin/git.pm