fix incorrect merge on jabbrcontext during rebase
fix incorrect merge on jabbrcontext during rebase

yadyn/JabbR,e10/JabbR,borisyankov/JabbR,ajayanandgit/JabbR,mzdv/JabbR,SonOfSam/JabbR,18098924759/JabbR,lukehoban/JabbR,JabbR/JabbR,CrankyTRex/JabbRMirror,CrankyTRex/JabbRMirror,18098924759/JabbR,e10/JabbR,borisyankov/JabbR,fuzeman/vox,CrankyTRex/JabbRMirror,yadyn/JabbR,lukehoban/JabbR,timgranstrom/JabbR,LookLikeAPro/JabbR,LookLikeAPro/JabbR,yadyn/JabbR,M-Zuber/JabbR,fuzeman/vox,LookLikeAPro/JabbR,lukehoban/JabbR,SonOfSam/JabbR,M-Zuber/JabbR,timgranstrom/JabbR,fuzeman/vox,borisyankov/JabbR,JabbR/JabbR,mzdv/JabbR,ajayanandgit/JabbR