Merge commit 'upstream/master' into mc5
[empathy.git] / nothere / Makefile.am
1 SUBDIRS = src data
2