Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
author Maxious
()
committer Maxious
()
commit 7d16d6eb99e51155f343c815a9a052810ee04739
tree 2b961a348c6cdd05584a3b571417e5f0f8dfbbef
parent aa30d3bc3c8200cfda6e3821314d1b6b2595f677
parent 2868eef7ef57a3aa9134d7ecf6b70f86d664ea0e
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr

Conflicts:
scannr.py
.gitmodules [ new file with mode 0644 ]
pynma [ new directory with mode 0000 ]
scannr.py