yehster/openemr — comment on commit 65211904410d08bfdc6c62f0c5ed2d9866340b0a
File:  line 0
By bradymiller:

In this situation, could always bring in both commits (Tony's original one and Kevin's f/u commit) since both commit comments are well documented and then both parties also get credited as authors.