Merge branch 'master' into part-to-stream-in-plugins
[modest] / man /
drwxr-xr-x   ..
-rw-r--r-- 1597 Makefile.am
-rw-r--r-- 4401 modest.1