Yahya related to me from Malik from Nafi that Abdullah ibn Umar used to trim his beard and moustache when he shaved at the end of a hajj or umra.
Muwatta Malik Book 20, Hadith 199