8b30d8f Merge branch 'upstream'

~strahinja pushed to ~strahinja/st git

541fa91 dwm.c: Fix conflicts with upstream

~strahinja pushed to ~strahinja/dwm git