wapiti client gets source info
resolving merge conflict
Merge pull request #9 from slaporte/master

:-)