Adria is the Witch merchant from Diablo 1. She sold and bought potions, scrolls and staves. She also recharged staves with their magical charges. She was not in Diablo 2, having fled Tristram in anticipation of the attack on the village.
She will feature in Diablo 3 although it is not known in what capacity.