mbruker/Cockatrice — comment on commit 355c0919e76e352af54d45ec357ed602fae76fd1
File:  line 0
By Daenyth:

FYI, re: your IM

You should just be able to merge master into devel - there's no problem with merging back and forth in git.