Merge http://nmbug.tethera.net/git/nmbug-tags
[nmbug-tags.git] / tags / 1330122640-18895-5-git-send-email-pieter@praet.org / patch