Merge remote-tracking branch 'origin/release' into stable
[contrib/qtwebsockets.git] / .gitattributes
2014-03-01 Sergio AhumadaAdd .tag file and the git-archive export options