Update merge tool
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.10
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Merge remote-tracking branch 'origin/arch'
Add Linux Mint 17 Qiana as supported release
Add Linux Mint 17 Qiana as supported release
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.10
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Merge remote-tracking branch 'origin/arch'
update package name for reinstalling kernel
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.10
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Merge remote-tracking branch 'origin/arch'
Bring in changes for kernel 3.15.3
Drop pwrseqcmd.o temporarily from rtl8188ee to fix the build
Update verify_branch to account for Arch's use of kernel 3.15.x
backup function retorn 0 if user declines backup so our Make install script
doesn't abort