Fix IrcCompleterPrivate::completeWords()

Make sure a nick name gets appropriately suffixed even when there's
a query open with the same nick name (so it picks up the buffer name
for auto-completion).
Merge branch '3.1'

Conflicts:
	src/util/irccompleter.cpp