chiark / gitweb /
Merge remote-tracking branch 'mdw/mdw/convert-script'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 30 Apr 2014 17:34:39 +0000 (18:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 30 Apr 2014 17:36:21 +0000 (18:36 +0100)
commit194b32e42f9d2a9555b920defef6fffae792e008
treeaef0f13f4015f4e3e12fb1417a68cb05c93d06af
parentceaf70dbd1b58bb51a65f905b845505e00b54037
parent53057d8cd75183d79e14e0a4ee05042ac436a870
Merge remote-tracking branch 'mdw/mdw/convert-script'

"iwj's original" 8298cc36e3a7eef91f722e7115ea8b5a9366fb55
is actually identical to 8e04e8e83b27a61d1471c81de5f8aabe29dda30a
apart from the .gitignore

Conflicts:
convert