Files
evolution/plugins/external-editor
Matthew Barnes cbaa9eb743 Merge branch 'master' into kill-bonobo
Conflicts:
	plugins/audio-inline/org-gnome-audio-inline.eplug.xml
	plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
	plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
	plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
	plugins/select-one-source/org-gnome-select-one-source.eplug.xml
2009-05-21 18:23:14 -04:00
..
2009-05-20 16:50:00 +02:00