Merge remote-tracking branch 'svn/trunk'
Merge remote-tracking branch 'svn/trunk'
Merge branch 'master' of https://github.com/Bakke/qTranslate