Merge branch 'icons' of git://github.com/Teknocrat/blueman into Teknocrat-icons
Merge branch 'Teknocrat-icons'
Merge remote-tracking branch 'upstream/master'