Merge pull request #631 from jisqyv/jischanges
authorThomasV <thomasv1@gmx.de>
Fri, 28 Mar 2014 16:19:48 +0000 (17:19 +0100)
committerThomasV <thomasv1@gmx.de>
Fri, 28 Mar 2014 16:19:48 +0000 (17:19 +0100)
Updates for merchant.py


Trivial merge