Merge commit 'cassidy/irc'
[empathy.git] / m4 / Makefile.am