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)
commitaea9a6892f40347098d91e4afdb7c1911e59387c
tree24f7bb44f70e7b72b828c4522c1d2c1cbe8a4bd2
parent363e6ad73e1da7d5e479653d5a6d81445083bdea
parentd33a651051ef03e1d61fde71113c873972d258b4
Merge branch 'master' into sipb
IkiWiki/Plugin/git.pm
IkiWiki/Wrapper.pm