CHANGELOG Merge Conflict Resolution
CHANGELOG Merge Conflict Resolution

hasseboulen/WoWAnalyzer,enragednuke/WoWAnalyzer,yajinni/WoWAnalyzer,FaideWW/WoWAnalyzer,FaideWW/WoWAnalyzer,fyruna/WoWAnalyzer,fyruna/WoWAnalyzer,ronaldpereira/WoWAnalyzer,FaideWW/WoWAnalyzer,anom0ly/WoWAnalyzer,yajinni/WoWAnalyzer,Juko8/WoWAnalyzer,enragednuke/WoWAnalyzer,sMteX/WoWAnalyzer,fyruna/WoWAnalyzer,ronaldpereira/WoWAnalyzer,Juko8/WoWAnalyzer,anom0ly/WoWAnalyzer,enragednuke/WoWAnalyzer,yajinni/WoWAnalyzer,anom0ly/WoWAnalyzer,hasseboulen/WoWAnalyzer,WoWAnalyzer/WoWAnalyzer,hasseboulen/WoWAnalyzer,WoWAnalyzer/WoWAnalyzer,anom0ly/WoWAnalyzer,Juko8/WoWAnalyzer,sMteX/WoWAnalyzer,WoWAnalyzer/WoWAnalyzer,yajinni/WoWAnalyzer,ronaldpereira/WoWAnalyzer,sMteX/WoWAnalyzer