kaelima/WowPacketParser — comment on commit 6e4e7076f3436b5277d5d59aaa83696a8dda9867
File:  line 0
By Fredi:

$ git fetch origin
$ git rebase origin/master
$ git pull origin master

Will avoid this merge =P