Matthew Barnes 85b2913a38 Merge revisions 36534:36684 from trunk. ...

svn path=/branches/kill-bonobo/; revision=36685

2008-10-24 23:52:05 +00:00

..

apps-evolution-template-placeholders.schemas.in

…

ChangeLog

Merge revisions 36534:36684 from trunk.

2008-10-24 23:52:05 +00:00

Makefile.am

…

org-gnome-templates.eplug.xml

…

templates.c

Merge revisions 36534:36684 from trunk.

2008-10-24 23:52:05 +00:00

templates.glade

…