Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org / obsolete