Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 1309379221-5617-3-git-send-email-daniel.schoepe@googlemail.com / obsolete