Log Message:
-----------
Add MERGE TODO.detail:
> [merge]
378a380
> [merge]
Modified Files:
--------------
pgsql/doc:
TODO (r1.1707 -> r1.1708)
(http://developer.postgresql.org/cvsweb.cgi/pgsql/doc/TODO.diff?r1=1.1707&r2=1.1708)
pgsql/doc/src/FAQ:
TODO.html (r1.214 -> r1.215)
(http://developer.postgresql.org/cvsweb.cgi/pgsql/doc/src/FAQ/TODO.html.diff?r1=1.214&r2=1.215)