Merge commit 'upstream/master' into mc5
[empathy.git] / nothere /
drwxr-xr-x   ..
-rw-r--r-- 103 .gitignore
-rw-r--r-- 20 Makefile.am
drwxr-xr-x - data
drwxr-xr-x - src